merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 6 Jan 2014 09:56:30 +0000 (09:56 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 6 Jan 2014 09:56:30 +0000 (09:56 +0000)
commit72ee2e9fd563c0d76f64fcd3b4d1cc42e7c21422
treebe3b423ba3b58453b764186cb721a436f2eeace2
parent238441fa97ab893f91483a2add8ffef974604b52
merge-update from trunk