merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 11:24:16 +0000 (11:24 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 11:24:16 +0000 (11:24 +0000)
commit8f6040e7609c081552f8c9e914cd1d39cf7e83a1
tree5386eed45de8ed72400e64f47688a0c011bdb6bf
parent27d05e961eb0c98fa2d9bc88fcfaa47b869e8eac
parent101bf27777e2d7b396cc1aba961519a68f42fa5a
merge-update from trunk