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)
commitccc5a740b24a51e01b034063f7fd44e75ff99902
tree3e822021a70d86c32ec5fe2d359b622040337278
parentc63055a729959f5d1aa41ed271536d40e9160b7f
parent137b5f05741925d25ede5fdff15c6f97e6d929ea
merge-update from trunk
.gitattributes