merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 11 Aug 2014 12:28:34 +0000 (12:28 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 11 Aug 2014 12:28:34 +0000 (12:28 +0000)
commit8adac298192a5daa3fd8ef4eb585577837672160
treeb795502e044ec996978a57a340a74960f28f39b6
parente62eae92b4ded629aa4cb5d8be4892045af4e771
parent1c215f0d27e5aec133606bf36f0c6f23bda84ad2
merge-update from trunk