]> www.fi.muni.cz Git - test/testrepo.git/commitdiff
Merge branch 'sdilena_vetev' master snapshot-20120124-1430
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:19:12 +0000 (14:19 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:19:12 +0000 (14:19 +0100)
Argumenty: .git/MERGE_MSG merge


Trivial merge