merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 13 Oct 2014 11:51:58 +0000 (11:51 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 13 Oct 2014 11:51:58 +0000 (11:51 +0000)
commite75d85c6854c753974a31d4e36f1c1ecf8c27dc6
tree529279aded51783824b09eb136499fdf8c2d3a14
parent48c7de1dca3c58f7102af6e8fd2e955b53e2eaab
parentada6db1d10ae2e43a6d4248f058e51a79b161b85
merge-update from trunk