Merge branch 'master' of ralfj.de:saartuer
authorConstantin Berhard <constantin@exxxtremesys.lu>
Thu, 10 Oct 2013 14:54:04 +0000 (16:54 +0200)
committerConstantin Berhard <constantin@exxxtremesys.lu>
Thu, 10 Oct 2013 14:54:04 +0000 (16:54 +0200)
1  2 
statemachine.py

diff --cc statemachine.py
Simple merge