From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Dec 2013 03:16:55 +0000 (+0100)
Subject: Merge branch 'master' into phcoder/scratch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d83f4d467f50ad3571e843018ff7a8c841f2eed;p=thirdparty%2Fgrub.git

Merge branch 'master' into phcoder/scratch
---

1d83f4d467f50ad3571e843018ff7a8c841f2eed