[Pkg-ocaml-maint-commits] [approx] 06/08: 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 075cae1bcad030fefadfbc0b1e4a98c611be1437
Merge: 08f60e2 4992e9c
Author: Eric Cooper <ecc at cmu.edu>
Date:   Sat Jun 21 17:29:39 2014 -0400

    Merge branch 'upstream'

 approx.ml | 17 +++++++++++++----
 config.ml | 20 ++++++++------------
 doc/FAQ   |  4 ++--
 url.ml    | 27 ++++++++++++++++++++++++---
 url.mli   |  5 ++++-
 util.ml   | 14 +-------------
 util.mli  | 12 ++++++------
 7 files changed, 58 insertions(+), 41 deletions(-)

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