merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 16 Oct 2014 07:50:47 +0000 (07:50 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 16 Oct 2014 07:50:47 +0000 (07:50 +0000)
commit4b3ddc964030904a6b13ec1223393d11fda12ef3
tree2aceac5870cc6522d6355e60c5a8b11a74b54385
parent4142bc88fc06d3770f090640d232e39d36177a31
merge-update from trunk