From: Stephane Glondu <steph@glondu.net>
Date: Wed, 20 Jan 2010 17:33:28 +0000 (+0100)
Subject: Merge branch 'master' into experimental/master
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~365
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9141e8526acf3826cdcf75a50bd208b89d920eea;p=ocaml.git

Merge branch 'master' into experimental/master

Conflicts:
	debian/changelog
---

9141e8526acf3826cdcf75a50bd208b89d920eea
diff --cc debian/changelog
index d8ca43fb,80e56cff..ce93e174
--- a/debian/changelog
+++ b/debian/changelog
@@@ -12,7 -9,10 +12,10 @@@ ocaml (3.11.2-1) UNRELEASED; urgency=lo
    * debian/control:
      - Make camlp4-extra depend on ocaml-base-nox
  
+   [ Ralf Treinen ]
+   * debian/control.in: bump dependency of ocaml-mode on emacs22 to emacs23.
+ 
 - -- Ralf Treinen <treinen@debian.org>  Sat, 02 Jan 2010 13:42:30 +0100
 + -- Stéphane Glondu <glondu@debian.org>  Wed, 20 Jan 2010 18:32:10 +0100
  
  ocaml (3.11.1-5) unstable; urgency=low