merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Oct 2014 10:42:04 +0000 (10:42 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Oct 2014 10:42:04 +0000 (10:42 +0000)
commit69daa919c7022842410b6b84da09b63ddc1f6175
treeee8902cda6f7866e96a5d5513a63706723e8a035
parentb85b96a3fe6587341b32b869abf1ecf2d130f1d9
parent2ab58273e9ab9751f5dbb94dbafeca6bc23af051
merge-update from trunk
.gitattributes