Merge trunk into branch
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 28 Apr 2016 09:25:24 +0000 (11:25 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 28 Apr 2016 09:25:24 +0000 (11:25 +0200)
commitb64debfcf348f3c45255e1836fd9772c65d5316c
treeb4ceec299cb1eda62eabfb734340745df58f1bc6
parent43d3e0c895abeff9ebf9ecd63bf8a58352274b9d
parent1ba5d960c06e5b511d950cf4e7978055125af779
Merge trunk into branch