From: Martin Synek <synek.martin@gmail.com>
Date: Fri, 6 May 2011 11:22:55 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into shapedet
X-Git-Tag: start2012~8^2
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/eurobot/public.git/commitdiff_plain/7d77be01ca28b311db843df80f542511898fb45c

Merge remote branch 'origin/master' into shapedet

Conflicts:
	src/robofsm/map_handling.c

Conflicts solved.
---

7d77be01ca28b311db843df80f542511898fb45c