Merge pull request #189 from yin8086/release-v1.6.0-Chinese

James Moger

2014-06-10 51740339142c4b00a59cea29babd6af69e7bf067

 .gitignore

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