[Pkg-ocaml-maint-commits] [approx] 03/06: 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 93c17aae5b748ea2591ef125f9ceda243f482fe1
Merge: 3b33301 db460f0
Author: Eric Cooper <ecc at cmu.edu>
Date:   Tue Jul 4 12:12:35 2017 -0400

    Merge branch 'upstream'

 approx.ml | 4 ++--
 config.ml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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