Merge branch 'master' of git://git.debian.org/d-i/grub-installer

Conflicts:
	debian/changelog
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 2 different commits each, respectively.
#
# Changes to be committed:
#
#	modified:   debian/changelog
#	modified:   debian/po/lt.po
#
