merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jul 2013 17:41:45 +0000 (17:41 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jul 2013 17:41:45 +0000 (17:41 +0000)
commit8743e9e9786dad3c0c11c50a6c01b9173e9a7e93
tree1e3001a9d61b90f3912cddeb63e01e4b3ea09f75
parentef06e613ba1df4edd5861ef41514c3203ff2cad8
merge-update from trunk