Merge branch 'debian'

Conflicts:
	debian/changelog

diff --cc debian/changelog
index ec339e0,c66fdac..4ec3058
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,13 +1,23 @@@
+ live-boot (3.0~b9-1) unstable; urgency=low
+ 
+   [ Tails developers ]
+   * Making the /live to /lib/live move for the persistence code.
+   * Handling already mounted persistence backing media correctly.
+   * Fixing persistence-media option when no devices are attached.
+   * Using 'local' in a safe way.
+ 
+  -- Daniel Baumann <daniel@debian.org>  Mon, 10 Dec 2012 20:01:21 +0100
+ 
 +live-boot (3.0~b8-1+grml.1) unstable; urgency=low
 +
 +  The "sync with Debian's 3.0~b8-1 version" release
 +
 +  [ Evgeni Golov ]
 +  * [ce765d3] refresh patches against Debian's 3.0~b8-1
 +  * [b484d6d] allow the use of multiple initramfs hooks and scripts again
 +
 + -- Michael Prokop <mika@grml.org>  Thu, 06 Dec 2012 12:51:50 +0100
 +
  live-boot (3.0~b8-1) unstable; urgency=low
  
    * Removing eject from recommends, the script that ejects the live medium