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)
commitb5c51bc0c3550a929f70a343544f6f56b4ca93df
treefa45bfbafc08bf04d1e3f8c8c59d2e7f3cbc4aed
parent80e356f6c79a9291f58a82f62f6572859e902377
parentc9431ec7743817a965b6a5f73896073aba76046a
merge-update from trunk
.gitattributes