Merge branch 'cjwatson/timeout-style'
authorColin Watson <cjwatson@ubuntu.com>
Tue, 3 Dec 2013 16:15:45 +0000 (16:15 +0000)
committerColin Watson <cjwatson@ubuntu.com>
Tue, 3 Dec 2013 16:15:45 +0000 (16:15 +0000)
commit44d488477902f0786d6bce44b74713f1713a34a9
treeca5aadab326538ffa47be8dfa33548b39c44d2e9
parent9e4e6ddfbfaad73e0c0f542c818c247135961c48
parent10955cda069d26a2f879fb766b542251f8bfe8a8
Merge branch 'cjwatson/timeout-style'
ChangeLog
docs/grub.texi