upp: parole
xfce show hidden files for debian wheezy
don't re-setup web browsers, disable chromium setup on debian wheezy
Merge remote-tracking branch 'upstream/master'