merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 20 Aug 2014 07:56:33 +0000 (07:56 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 20 Aug 2014 07:56:33 +0000 (07:56 +0000)
commitb12b0460ff77cb4aad96dfaf530020c932f32d8b
tree7150bab67420a0876ce0086610b15aed38133192
parent2346747125cd5adf3d42b705c1f9fb903d879bd1
merge-update from trunk