From a1b7cc7d4d4271868b4a6a347530c881a7ac8407 Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Sat, 4 Dec 2010 15:27:05 +0100
Subject: [PATCH] Fix previous merge

---
 debian/changelog | 2 --
 1 file changed, 2 deletions(-)

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).
 
-- 
2.30.2