X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Fchangelog;h=9d4d3a30b71264c8150701b573f42a41b53902a3;hb=496ea4aee6c10fb6fa4d799df0df7ae34b4deb0b;hp=e403144a7353c791f4cf3a873ff46f4c27d243f0;hpb=e91e8014625712743f25ca4030ef064a6c3f34c0;p=debian%2Felilo

diff --git a/debian/changelog b/debian/changelog
index e403144..9d4d3a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+elilo (3.12-5) unstable; urgency=low
+
+  * merge 3.12-4.1 diff from Christian Perrier
+  * add VCS entries to control file
+  * update standards version
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 29 Jun 2012 09:25:49 -0600
+
 elilo (3.12-4.1) unstable; urgency=low
 
   * Non-maintainer upload.