This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository hevea.
commit 21c5c83e467fccc41eaa2612ba826a970c4fd517
Merge: 495939b 38a81dd
Author: Ralf Treinen <trei...@debian.org>
Date: Tue Jan 14 11:48:39 2014 +0100
Merge tag 'upstream/2.11'
Upstream version 2.11
Conflicts:
CHANGES
README
version.ml
CHANGES | 8 ++++++++
README | 2 +-
cross.ml | 31 ++++++++++++++++++-------------
cut.mll | 2 +-
htmllex.mll | 4 +++-
latexcommon.hva | 4 ++--
text/hevea.hva | 4 ++--
version.ml | 4 ++--
8 files changed, 37 insertions(+), 22 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/hevea.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
