]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
projects / thirdparty / grub.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6a6182 deaa705)
Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
authorVladimir Serbinenko <phcoder@gmail.com>
Sat, 16 Nov 2013 15:17:46 +0000 (16:17 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Sat, 16 Nov 2013 15:17:46 +0000 (16:17 +0100)
Conflicts:
ChangeLog


Trivial merge
Mirror of https://git.savannah.gnu.org/git/grub.git