Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/html/git/bike-lights
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Mon, 28 Oct 2013 21:18:09 +0000 (22:18 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Mon, 28 Oct 2013 21:18:09 +0000 (22:18 +0100)

Trivial merge