merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Oct 2014 11:18:35 +0000 (11:18 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Oct 2014 11:18:35 +0000 (11:18 +0000)
commitcd708c2bd3425d38d8f448bc2dd7a339a89f6a60
treea67a2079ae459431dc4ede6bf6820cf9532b4924
parentf6d5e56074ddaef069e28ddfc63274d5b1b12e83
merge-update from trunk