merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 14 Oct 2013 08:32:41 +0000 (08:32 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 14 Oct 2013 08:32:41 +0000 (08:32 +0000)
commit324d3d050b97f5f09469b48bf4782d61b44cdd04
tree470fc823e1d199f395e95793066eaaeda37f4d1a
parenta022f6f00831483e4331d63b932740dc01fa7013
parenta84a1660c1dd11ffb43d45d3e8aac14c710ad055
merge-update from trunk