merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 1 Jul 2015 09:09:33 +0000 (09:09 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 1 Jul 2015 09:09:33 +0000 (09:09 +0000)
commit136811ac0f043b22c402f1e6bedd55db97a7e96e
tree4a48efe1c3c620a2502d8b1054d1d02047d9d882
parent9efdbc2934d0759ea00486a71479db67a206d885
parent94465d2166c63598fbc43e2fe94ec5fafd15ad05
merge-update from trunk