merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 19 Aug 2014 13:35:40 +0000 (13:35 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 19 Aug 2014 13:35:40 +0000 (13:35 +0000)
commit2346747125cd5adf3d42b705c1f9fb903d879bd1
tree7150bab67420a0876ce0086610b15aed38133192
parent1bf80c0c5daafa3cf40d34be966146731c669fb9
parent6c0e98adacb888778452fd08043f8f4ccba2ba74
merge-update from trunk