Merge branch 'mezery'
authorTomas Musil <tomik.musil@gmail.com>
Wed, 21 Mar 2012 13:02:40 +0000 (14:02 +0100)
committerTomas Musil <tomik.musil@gmail.com>
Wed, 21 Mar 2012 13:02:40 +0000 (14:02 +0100)
1  2 
robot.py

diff --cc robot.py
Simple merge