merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 9 Oct 2014 13:31:50 +0000 (13:31 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 9 Oct 2014 13:31:50 +0000 (13:31 +0000)
commit5807aa09e193afe85c620415d3a48c39fc100dcf
tree6fa03489e438f5f0c37fad46a6a840257481a6ba
parentc200d18b9bae445d93e2cade6e812fabf8274728
merge-update from trunk