merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 17 Jun 2015 13:52:06 +0000 (13:52 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 17 Jun 2015 13:52:06 +0000 (13:52 +0000)
commit61ec9fa71937f1b68fc589636c4f63bf6711f938
treefac4bcc4ae2fc2249c9e234073685ad70de18204
parentc31e35b47f81c1462e4b3fae8ad191cd8da68d08
parentd24b444b7bf4e1bd048f864bcfede121794caddf
merge-update from trunk
.gitignore