merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 22 Oct 2013 06:33:09 +0000 (06:33 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 22 Oct 2013 06:33:09 +0000 (06:33 +0000)
1  2 
.gitattributes

diff --cc .gitattributes
Simple merge