merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 10 Dec 2014 15:28:01 +0000 (15:28 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 10 Dec 2014 15:28:01 +0000 (15:28 +0000)
commit7cad7934c6a4741654b5937c34b3848cf6c79c17
treedc6b9da4b0874aae2fc9a5ddc45b4f9097c3857a
parentc9d7b4eb56db8038f68ee13247e0268765c6ffcb
parentc7322065dc6962eb96914bac2403d7b2e712e1bb
merge-update from trunk