[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 312/master, updated. debian/3.11.2-1-42-ga1b7cc7

[Stephane Glondu]

The following commit has been merged in the 312/master branch:
commit a1b7cc7d4d4271868b4a6a347530c881a7ac8407
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Dec 4 15:27:05 2010 +0100

    Fix previous merge

diff --git a/debian/changelog b/debian/changelog
index 8de4c8f..0c7315e 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).
 

-- 
OCaml packaging