Merge branch 'ticket/129' into develop

James Moger

2014-09-30 f685ea581f94373a63bcdc94ec417fdf92a95d68

 .gitignore

@@ -19,3 +19,11 @@
/x509test
/data
/*.conf
/build-next.xml
/*.ps1
/*.sh
/*.factorypath
/src/main/dagger
/**/.idea
/**/init.lua
/**/session