merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 10:58:51 +0000 (10:58 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 10:58:51 +0000 (10:58 +0000)
commitef974737e44f677001b02e55fa8da77ed1cc2d0e
tree52a31cac3bd1f05f7359086e7ab09aa12c80a961
parentdbf426c86411be307867a2917cca9e5f47a5dae1
parent76aa4c2542f2d24d65054e237b5600302874fa15
merge-update from trunk