merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Jun 2014 08:34:10 +0000 (08:34 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Jun 2014 08:34:10 +0000 (08:34 +0000)
commit816877d730e6e6ff9e1848257da0ef9c8e8917e6
treef26b3d9f9cf15eadf25b378b4454074813928cfd
parentb71d3062f3163053f3ba59b9c961da6522d986a5
parent21db0158fa172e287c1d43d4fc7214cf480090d0
merge-update from trunk