[Pkg-ocaml-maint-commits] [fieldslib] 03/04: Merge tag 'upstream/109.20.03'

[Lifeng Sun]

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

lifengsun-guest pushed a commit to branch master
in repository fieldslib.

commit 8219478b3741248ee4898c51e0fb339122132e5b
Merge: 81a4233 39f806a
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Apr 12 21:41:30 2014 +0800

    Merge tag 'upstream/109.20.03'
    
    Upstream version 109.20.03
    
    Conflicts:
    	INSTALL.txt
    	_oasis
    	lib/META
    	setup.ml

 INSTALL.txt |  4 ++--
 _oasis      |  9 +--------
 lib/META    |  6 +++---
 setup.ml    | 44 ++++++--------------------------------------
 4 files changed, 12 insertions(+), 51 deletions(-)

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