[Merge] ~edubuntu-dev/livecd-rootfs:ubuntu/master into livecd-rootfs:ubuntu/master

[Steve Langasek]

The proposal to merge ~edubuntu-dev/livecd-rootfs:ubuntu/master into livecd-rootfs:ubuntu/master has been updated.

    Status: Needs review => Work in progress

For more details, see:
https://code.launchpad.net/~edubuntu-dev/livecd-rootfs/+git/livecd-rootfs/+merge/457182
-- 
Your team Edubuntu Developers is subscribed to branch ~edubuntu-dev/livecd-rootfs:ubuntu/master.