]> www.fi.muni.cz Git - test/testrepo.git/commitdiff
Merge branch 'master' of ssh://akis.fi.muni.cz/~git/testrepo snapshot-20111206-1730
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 6 Dec 2011 16:17:30 +0000 (17:17 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 6 Dec 2011 16:17:30 +0000 (17:17 +0100)
Argumenty: .git/MERGE_MSG merge


Trivial merge