From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Fri, 18 Jan 2013 21:50:50 +0000 (+0100)
Subject: Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/bike-lights
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=commitdiff_plain;h=cb10e19fb7311df4c3c14b64064c3d9a44fdacd1

Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/bike-lights

Conflicts:
	firmware/adc.c
---

cb10e19fb7311df4c3c14b64064c3d9a44fdacd1