[Pkg-ocaml-maint-commits] [hevea] 02/05: Merge remote-tracking branch 'origin/master' into experimental/master

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch experimental/master
in repository hevea.

commit fae0bb9b51b9e3eae1e281db8a866c1b374eba9c
Merge: d5a44d3 33585db
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Nov 8 19:57:47 2013 +0100

    Merge remote-tracking branch 'origin/master' into experimental/master

 CHANGES                         |    8 ++++++++
 README                          |   12 +++++------
 cut.mll                         |   42 +++++++++++++++++++++++++--------------
 cutOut.ml                       |    5 ++++-
 cutOut.mli                      |    1 +
 debian/README.Debian            |    8 ++++++++
 debian/changelog                |   12 ++++++++---
 debian/control                  |    4 ++--
 debian/examples/pictures/README |    3 +++
 html/color.hva                  |    2 ++
 package.ml                      |    4 ++--
 version.ml                      |    4 ++--
 12 files changed, 74 insertions(+), 31 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/hevea.git