commit 772a0c6b2aef4ec3f6972fdba7e40b6edcc8752b
Merge: bef15c15 fd34f133
Author: Jan Dankert 
Date:   Sun Apr 14 01:24:09 2013 +0200

    Zusammenführen