merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 1 Aug 2013 11:30:50 +0000 (11:30 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 1 Aug 2013 11:30:50 +0000 (11:30 +0000)
commitf36ba6a3eb822b3382028f9924788a16d0764649
treedb5268d137eebb2961215ba2b4d7787e91c60f51
parent7c5ba8e0bb7409a0be7ad1e096c68df4f0432f9f
merge-update from trunk