Merge lp:~zequence/ubiquity/change-ubuntustudio-wallpaper into lp:ubiquity

[Kaj Ailomaa]

Changes the background wallpaper to the current default Ubuntu Studio wallpaper

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2013-05-01 18:27:36 +0000
+++ bin/ubiquity-dm	2013-06-30 15:49:28 +0000
@@ -305,7 +305,7 @@
             background_image = None
             for background in (
                     '/usr/share/backgrounds/edubuntu_default.png',
-                    '/usr/share/xfce4/backdrops/macinnis_wallpaper.png',
+                    '/usr/share/xfce4/backdrops/ubuntustudio-rock.png',
                     '/usr/share/xfce4/backdrops/xubuntu-precise-right.png',
                     '/usr/share/lubuntu/wallpapers/'
                     'lubuntu-default-wallpaper.png',

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-25 12:22:17 +0000
+++ debian/changelog	2013-06-30 15:49:28 +0000
@@ -1,3 +1,9 @@
+ubiquity (2.15.9) UNRELEASED; urgency=low
+
+  * Changed Ubuntu Studio background in bin/ubiquity-dm
+
+ -- Kaj Ailomaa <[e-mail]>  Sun, 30 Jun 2013 17:36:36 +0200
+
 ubiquity (2.15.8) saucy; urgency=low
 
   [ Colin Watson ]