commit bd721926709b6b9252772dcc2fe7c111c0adcfe3
Merge: 06b9ce54 1bf8d41d
Author: Jan Dankert 
Date:   Fri Oct 26 22:16:18 2012 +0200

    Zusammenführen