]> www.fi.muni.cz Git - slotcarman.git/commitdiff
Merge branch 'master' of ssh://calypso.fi.muni.cz/~kas/git/slotcarman
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 3 Dec 2010 21:00:01 +0000 (22:00 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 3 Dec 2010 21:00:01 +0000 (22:00 +0100)

Trivial merge