Merge branch 'master' of ralfj.de:saartuer
authorRalf Jung <post@ralfj.de>
Thu, 24 Oct 2013 17:45:26 +0000 (19:45 +0200)
committerRalf Jung <post@ralfj.de>
Thu, 24 Oct 2013 17:45:26 +0000 (19:45 +0200)
commit344d58d13b3ec1d7fb26d13de114d6e8afbe3218
tree1795d5286dae2748a583e8d2a62db740b8ab38ea
parenteb3e24210b024a3393e629f133bef7c66eddceae
parentbdf4adf1c9155148f713dd6e7eda955c495155b3
Merge branch 'master' of ralfj.de:saartuer

Conflicts:
statemachine.py
statemachine.py
tuerd