merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Oct 2014 11:19:09 +0000 (11:19 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Oct 2014 11:19:09 +0000 (11:19 +0000)
commit5ceb94dec4ec95034f6f657828c25c793ec18342
treeb940479c83fed99945a24d1f6d72ef904149c1b4
parente4428955564572cba1eb7ce59741150b719873f8
parent83c8d57f9803bab457f07ae3d841300167586a7e
merge-update from trunk
.gitattributes