commit 75a733ea6244a12b1f1581959bc2ec87e6293ddd
Merge: 4e68ebe6 d4bda12b
Author: Jan Dankert 
Date:   Mon Oct 15 02:13:50 2012 +0200

    Merge mit Version vom PC.