Merged #110 "Support multiple/chained config files"

James Moger

2014-10-27 959ec25027f1bce091dcd9cc2d93c721ff2dc35d

 .gitignore

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