From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Thu, 14 Jun 2012 21:57:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/git/osvetleni
X-Git-Tag: gedasymbols-20120913~60
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=commitdiff_plain;h=ac9739610c642b6c79b800b406ffc16a86553e11

Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/git/osvetleni

Conflicts:
	lights.c
---

ac9739610c642b6c79b800b406ffc16a86553e11