Merge branch 'master' of git+ssh://repo.or.cz/srv/git/otium
treef46c463d16a61ad1f3b62bfe1a149a956f189ee2
-rw-r--r-- 5942 otium.py
-rw-r--r-- 6685 world.py