Merge non-fast-forward for release branch merges

James Moger

2014-06-16 35bb2253c9ff0dcc44f3245026a141fde6415153

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