commit a0438198451310d88b986392c3f52e35b1f019c1
Merge: 6cd069b7 3a301703
Author: Jan Dankert 
Date:   Fri Oct 26 23:04:03 2012 +0200

    Zusammenführung.