merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 5 Aug 2014 12:12:40 +0000 (12:12 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 5 Aug 2014 12:12:40 +0000 (12:12 +0000)
commit083ce01ad96a041672c17ecb7c083305651ef3a2
tree64c6544a621f71309a4c7ce7d384b3ba402f4e07
parentaafd78b03d2304bee6462efa206ac240020ac334
parentb79e447b11aae47607af757deac046638d270288
merge-update from trunk