From: Stephane Glondu <steph@glondu.net>
Date: Sat, 4 Dec 2010 14:27:05 +0000 (+0100)
Subject: Fix previous merge
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~325
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a1b7cc7d4d4271868b4a6a347530c881a7ac8407;p=ocaml.git

Fix previous merge
---

diff --git a/debian/changelog b/debian/changelog
index 8de4c8f7..0c7315eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 ocaml (3.12.0-1) UNRELEASED; urgency=low
 
-  [ Stéphane Glondu ]
   * New upstream release (Closes: #255245, #570920)
     - add armel to native architectures; note that the Dynlink module is
       not available in native code there: software using it should take care
@@ -16,7 +15,6 @@ ocaml (3.12.0-1) UNRELEASED; urgency=low
 
 ocaml (3.11.2-2) unstable; urgency=low
 
-  [ Ralf Treinen ]
   * debian/ocaml-mode.emacs-install: do not byte-compile camldebug.el
     and inf-caml.el for xemacs21 (Closes: #508813, LP: #464587).