Merge pull request #1 from mmounirou/master

James Moger

2011-10-06 a652a6886031ff805fcabd852925c8a11b25dc1c

 .gitignore

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