commit 5c2a9ad888924c668e62feac3a55602885d63478
Merge: 50472ef7 e046e3dc
Author: Jan Dankert 
Date:   Tue Oct 30 23:21:16 2012 +0100

    Zusammenführen