Merge branch 'master' of github.com:mjirik/lisa into HEAD
pep8 debug
Merge branch 'stable' of github.com:mjirik/lisa