X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fchangelog;h=b57d0a2c338a0a681895436762cd0be04a035008;hb=aa79a70ee51dce6c2dc06ac51d6e65a6c0b7a3e9;hp=ecafa4171f2779cb6efa70607e4aca6bfe56114b;hpb=be8d3d25c7bd9c346767c12291722832cb1b03b7;p=live-boot-grml.git

diff --git a/debian/changelog b/debian/changelog
index ecafa41..b57d0a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+live-boot (1:20151213+grml.1) UNRELEASED; urgency=medium
+
+  * 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"
+  * [f0db64b] use pristine-tar by default
+
+ -- Evgeni Golov <evgeni@grml.org>  Wed, 06 Jan 2016 18:07:09 +0100
+
 live-boot (1:20151213) unstable; urgency=medium
 
   [ Iain R. Learmonth ]
@@ -20,17 +30,6 @@ live-boot (5.0~a5-2) unstable; urgency=low
   * 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