From: Martin Synek <synek.martin@gmail.com>
Date: Wed, 4 May 2011 12:57:39 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into shapedet
X-Git-Tag: start2012~58^2~2
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/eurobot/public.git/commitdiff_plain/2a6e532f0c3aeaeef61963a7de689b946075ed6f

Merge remote branch 'origin/master' into shapedet
---

2a6e532f0c3aeaeef61963a7de689b946075ed6f