]> www.fi.muni.cz Git - pan12-paper.git/commitdiff
Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/git/pan12-paper
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Thu, 9 Aug 2012 18:30:26 +0000 (20:30 +0200)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Thu, 9 Aug 2012 18:30:26 +0000 (20:30 +0200)

Trivial merge