+live-boot (1:20151213+grml.1) unstable; urgency=medium
+
+ [ Evgeni Golov ]
+ * Merge latest Debian changes.
+ * [aea94ce] add gbp.conf
+ * [9f0266a] fix "unexpected operator" error when stopping live-boot
+ * [83abdd6] Revert "restore support for old persistence media"
+ * [09d8468] remove debian/patches
+ * [0c43d97] make package native as in Debian
+ * [1a226f4] Revert "use auto instead of allow-hotplug in generated /e/n/interfaces"
+
+ [ Riccardo Murri ]
+ * [3f6c7f2] Allow selecting boot eth dev by MAC address
+
+ -- Evgeni Golov <evgeni@grml.org> Thu, 07 Jan 2016 08:47:27 +0100
+
live-boot (1:20151213) unstable; urgency=medium
[ Iain R. Learmonth ]
* Removing myself from uploaders, lost trust in Debian (#804315).
-- Daniel Baumann <mail@daniel-baumann.ch> Fri, 20 Nov 2015 13:04:24 +0100
->>>>>>> debian
-
-live-boot (5.0~a5-1+grml.1) UNRELEASED; urgency=medium
-
- [ Evgeni Golov ]
- * [aea94ce] add gbp.conf
- * [9f0266a] fix "unexpected operator" error when stopping live-boot
- * [83abdd6] Revert "restore support for old persistence media"
- * [f0db64b] use pristine-tar by default
-
- -- Evgeni Golov <evgeni@grml.org> Mon, 24 Aug 2015 21:04:50 +0200
live-boot (5.0~a5-1) unstable; urgency=low