merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jul 2013 16:13:54 +0000 (16:13 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jul 2013 16:13:54 +0000 (16:13 +0000)
commitef06e613ba1df4edd5861ef41514c3203ff2cad8
tree1e3001a9d61b90f3912cddeb63e01e4b3ea09f75
parent8b178e733dbeb1cbe36bf5148555deb596025f3a
merge-update from trunk