Merge pull request #3 from docbobo/master

James Moger

2012-01-02 0ea17fc294c1bb55a90037a150f4624992c0e9fb

 .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