merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Sep 2014 13:28:33 +0000 (13:28 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Sep 2014 13:28:33 +0000 (13:28 +0000)
commit6243ccccd426c4125be6f584671794e077d223ef
treec77829bcce54aa21e41a712598f8a4837b4bd94f
parentfddc59b712367ab9bb2da4ea3d477295db12633c
parent322a9bff515e71466936461c2729d35233db5d95
merge-update from trunk