[Merge] lp:~brunonova/ubuntu/trusty/xubuntu-default-settings/lp1310264 into lp:ubuntu/trusty-proposed/xubuntu-default-settings

[Sebastien Bacher]

https://launchpad.net/ubuntu/+source/xubuntu-default-settings/14.04.6
-- 
https://code.launchpad.net/~brunonova/ubuntu/trusty/xubuntu-default-settings/lp1310264/+merge/238935
Your team Ubuntu branches is subscribed to branch lp:ubuntu/trusty-proposed/xubuntu-default-settings.