Viewing all changes in revision 8.

Committer: Cody Garver
Date: 2015-08-04 20:28:27 UTC
mfrom: <a title="Merged From 1.1.3" href="/~elementary-os/elementaryos/os-patch-grub2-signed-trusty/revision/1.1.3">(1.1.3 grub2-signed-trusty)
Revision ID: cody@elementary.io-20150804202827-flcz790cbh627y1h

Merge lp:~elementary-os/ubuntu-package-imports/grub2-signed-trusty and resolve conflicts

added added

removed removed