[Pkg-ocaml-maint-commits] [approx] 08/09: Merge branch 'upstream'

[Eric Cooper]

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

ecc-guest pushed a commit to branch master
in repository approx.

commit b0ff20f84a88cffdc30d1b830bf66cba6ca36b4b
Merge: ea1ab75 ea743af
Author: Eric Cooper <ecc at cmu.edu>
Date:   Mon Dec 9 11:03:23 2013 -0500

    Merge branch 'upstream'

 Makefile               | 19 +++++++++--------
 _tags                  |  6 +++---
 approx.ml              | 27 ++++--------------------
 config.ml              |  9 ++++----
 doc/FAQ                | 15 ++++++++++++-
 doc/README.concurrency |  2 +-
 doc/approx.xinetd      |  7 +++++++
 etc/approx.socket      | 10 +++++++++
 etc/approx at .service    |  8 +++++++
 gc.ml => gc_cache.ml   |  5 +++--
 log.ml                 | 37 +++++++++++++++++++++++++-------
 myocamlbuild.ml        |  4 ++--
 pdiff.ml               | 16 +++++++-------
 tests/_tags            |  8 +++----
 tests/syslog_test.ml   | 14 -------------
 util.ml                | 57 +++++++++++++++++++++++++++++---------------------
 util.mli               | 49 +++++--------------------------------------
 17 files changed, 147 insertions(+), 146 deletions(-)

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