merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 9 Oct 2014 13:31:25 +0000 (13:31 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 9 Oct 2014 13:31:25 +0000 (13:31 +0000)
1  2 
.gitattributes

diff --cc .gitattributes
Simple merge