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)
1  2 
.gitattributes

diff --cc .gitattributes
Simple merge