]> www.fi.muni.cz Git - test/testrepo.git/commitdiff
Merge branch 'sdilena_vetev' of ../testrepo into sdilena_vetev2
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:18:19 +0000 (14:18 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:18:19 +0000 (14:18 +0100)

Trivial merge