merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 16 Oct 2014 07:20:07 +0000 (07:20 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 16 Oct 2014 07:20:07 +0000 (07:20 +0000)
commitd8fac7e45c175ff2cb7897172383aff738e39210
treea28f98575c24fb7dcf95947c936cb34f1ea4de7b
parent5ed2afc30897cb9765db14552d9760ce21d2fe89
merge-update from trunk