commit d923755f35b5a9dd183ff820573dd94a81380e5c
Merge: 484d22d7 95ca454a
Author: Jan Dankert 
Date:   Sat Oct 20 15:29:40 2012 +0200

    Zusammenführung.