merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 09:07:08 +0000 (09:07 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 09:07:08 +0000 (09:07 +0000)
commit27d05e961eb0c98fa2d9bc88fcfaa47b869e8eac
treef4b4fb9a81857b7eea914283012346256c2efd70
parentbd176faf53f878b04368f04e825f04db40a1f939
parente5d541d1106ec16d56c52e5b2e9e8404a6d7a370
merge-update from trunk