merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 7 Jul 2014 12:35:11 +0000 (12:35 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 7 Jul 2014 12:35:11 +0000 (12:35 +0000)
commita266096c000400c7ff13545d84a935d042069586
tree2b92a507b50465a858d14efa5ca7821c826b63cb
parent0c3f2f4fa0352a836e5510162f7bdbfc0420e2dc
merge-update from trunk