Merge branch 'master' into rpc

James Moger

2011-10-06 cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3

 .gitignore

@@ -8,3 +8,11 @@
/users.properties
/site
/git
/target
/build.properties
/war
/*.war
/proposals
/*.jar
/federation.properties
/mailtest.properties