[Merge] lp:ubuntu/vivid-updates/grub2 into lp:ubuntu/vivid/grub2

[roe shapiro]

roe shapiro has proposed merging lp:ubuntu/vivid-updates/grub2 into lp:ubuntu/vivid/grub2.

Commit message:
help:  see above

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~ubuntu-branches/ubuntu/vivid/grub2/vivid-updates/+merge/270090

all.  nothing works. cant install any updates.  doesnt recognize my computer administrator password
-- 
Your team Ubuntu branches is requested to review the proposed merge of lp:ubuntu/vivid-updates/grub2 into lp:ubuntu/vivid/grub2.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 6914 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150903/af011d31/attachment.diff>