commit 60da708846bdab0d692c2b0899b7823ec6865dfd
Merge: 5143208b f3ed57ff
Author: Jan Dankert 
Date:   Wed Oct 17 21:18:42 2012 +0200

    Zusammenführen