[Pkg-ocaml-maint-commits] [ocsigenserver] 04/07: Merge tag 'upstream/2.4.0'

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository ocsigenserver.

commit 10752c8fcbd99bada6c44a25c8558f57ce0267b9
Merge: 9ea853c cf340b2
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jun 19 07:27:03 2014 +0200

    Merge tag 'upstream/2.4.0'
    
    Upstream version 2.4.0

 .gitignore                        |  35 +++++++-
 Makefile.dist                     |  41 ++++++++++
 Makefile.options                  |   4 +-
 README                            |   6 +-
 VERSION                           |   2 +-
 doc/Makefile                      |   2 +-
 doc/indexdoc                      |   2 +-
 opam/opam                         |  10 ++-
 src/baselib/Makefile              |   2 +-
 src/baselib/ocsigen_config.mli    |   2 +
 src/baselib/ocsigen_lib.ml        | 166 --------------------------------------
 src/baselib/ocsigen_lib.mli       |  17 ----
 src/extensions/Makefile           |   1 +
 src/extensions/accesscontrol.ml   |  24 +++---
 src/files/META.in                 |   2 +-
 src/http/http_headers.ml          |   1 +
 src/http/http_headers.mli         |   1 +
 src/http/ocsigen_headers.ml       |  10 +++
 src/http/ocsigen_headers.mli      |   1 +
 src/http/ocsigen_http_com.ml      |  12 +++
 src/http/ocsigen_http_com.mli     |   3 +-
 src/server/ocsigen_extensions.ml  |   2 +-
 src/server/ocsigen_extensions.mli |   2 +-
 src/server/ocsigen_server.ml      |  46 +++++++++--
 24 files changed, 179 insertions(+), 215 deletions(-)

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