merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 4 Aug 2014 12:51:01 +0000 (12:51 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 4 Aug 2014 12:51:01 +0000 (12:51 +0000)
commit12fc9eed977fadd4d43ef359d9428309dedeb489
tree463524b44d3dcf3a39d2762725f8b7f03ed1ded0
parent776143314ebb6839d892b701038e54fa9fd3d414
parent7759e4deb22c41f9c5929bf45066b2e667ed00a2
merge-update from trunk