From: Ralf Jung <post@ralfj.de>
Date: Thu, 24 Oct 2013 17:45:26 +0000 (+0200)
Subject: Merge branch 'master' of ralfj.de:saartuer
X-Git-Url: https://git.ralfj.de/saartuer.git/commitdiff_plain/344d58d13b3ec1d7fb26d13de114d6e8afbe3218?ds=sidebyside;hp=344d58d13b3ec1d7fb26d13de114d6e8afbe3218

Merge branch 'master' of ralfj.de:saartuer

Conflicts:
	statemachine.py
---