merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 27 Mar 2015 12:46:41 +0000 (12:46 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 27 Mar 2015 12:46:41 +0000 (12:46 +0000)
commit47794ee9e5b1db905693e1c5cda86ac93e956ead
treeb0587a29e69e60f7395de5a213247d678c23b733
parentb16cf84f2d81b063efd493f48591db07d7be19aa
parent44b8818937195828b7e200764b02ffd20e3e1632
merge-update from trunk
.gitattributes