Merge branch 'master' into rpc

James Moger

2011-10-07 55cecdbb6c961441330c928f9ed587582f317f4b

 .gitignore

@@ -9,3 +9,10 @@
/site
/git
/target
/build.properties
/war
/*.war
/proposals
/*.jar
/federation.properties
/mailtest.properties