merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Jan 2014 08:34:38 +0000 (08:34 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Jan 2014 08:34:38 +0000 (08:34 +0000)
commit65f79ee65985c83c303b5b1e6f69966264b6d466
treed19d7435a98cfdf9406f639867cc19d958b95c55
parent05e64466df9783b1a669ac13efbbc710849a6082
merge-update from trunk