merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 7 Aug 2013 08:26:30 +0000 (08:26 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 7 Aug 2013 08:26:30 +0000 (08:26 +0000)
commitce746a9d55e997eb5f907906e5a6a19018f4b592
treee8a81d9e6f509414d381670cc49d05373d704b35
parenta14f5d39f39fbb0366e84f02ca5ff3e11ebc875b
merge-update from trunk