merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 27 May 2013 12:00:04 +0000 (12:00 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 27 May 2013 12:00:04 +0000 (12:00 +0000)
commit367b67e3280ca87025dc1759db2528bda18493a8
tree402cf439590bd482f58a021a79163327208e0c0c
parent6a9dd32f15a4b59e7badc8b1c83cba2ea704042d
merge-update from trunk