commit d572b2fdb7d1a8840b5cd3a42cd2df9fa29e15d6
Merge: 884cff10 6d02f6d4
Author: Jan Dankert 
Date:   Mon Nov 5 22:50:24 2012 +0100

    Zusammenführen