merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 10:51:10 +0000 (10:51 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 10:51:10 +0000 (10:51 +0000)
commitdbf426c86411be307867a2917cca9e5f47a5dae1
tree450633652478bf9e01f67f8e8eeea0ddcdbae745
parent0055584abdf9288a4d9170bfe683ffd8dd589451
parent7e9db7b7526f3dcdbf24f162678be25507107133
merge-update from trunk
.gitattributes