merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 19 Jun 2014 12:47:43 +0000 (12:47 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 19 Jun 2014 12:47:43 +0000 (12:47 +0000)
commit4751b9a1f8fc9739262dfd1f5a608b1c88404c09
treedc19e0ac76aed2f21b2b61ba3c9b2b5f718130b8
parentdd863ea4f74d77345ece7e41c06c6e0f77953b56
parentb72ce91f468d715e5970d85ccd7db0ed4d166e22
merge-update from trunk