Merge pull request #6 from lemval/master

James Moger

2012-01-31 78dc06a87f82ed19e3eebe1f16dc6c1bdaf5fbc5

 .gitignore

@@ -17,6 +17,10 @@
/federation.properties

/mailtest.properties

/.settings/*.prefs

/src/WEB-INF/gitblit.properties

/src/WEB-INF/reference.properties

/bin/

/.settings/

/javadoc
/express
/build-demo.xml
/users.conf