Merge branch 'ticket/241' into develop

James Moger

2015-02-26 318897758a14c4dc356df690b4021c388fe6e9e6

1
2
3
[submodule "src/main/distrib/data/gitignore"]
    path = src/main/distrib/data/gitignore
    url = https://github.com/github/gitignore.git