Merge branch 'master' into rpc

James Moger

2011-10-11 d4c9083f82d9c5e01d9694f02f66cee1084b66ff

 .gitignore

@@ -12,3 +12,7 @@
/build.properties
/war
/*.war
/proposals
/*.jar
/federation.properties
/mailtest.properties