merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Jul 2013 12:29:58 +0000 (12:29 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Jul 2013 12:29:58 +0000 (12:29 +0000)
commit7fb736d87fe30517a642370d8c922454f715709e
treeac417a15e268bd52bfbdf0519da89f8aa0f5bef1
parentc6fe549a7df3df6cc379b19befa5bd5a55bda028
parent4aca539da70aa4765acdc7de8541447c4e9a576b
merge-update from trunk