[libmatheval] 01/05: Merge tag 'upstream/1.1.10+dfsg'

[Francesco Lovergine]

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

frankie pushed a commit to branch master
in repository libmatheval.

commit 723b3704b6a4daf165279616fb9918b473a18607
Merge: c9d5816 1eac133
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sat Mar 15 17:25:56 2014 +0100

    Merge tag 'upstream/1.1.10+dfsg'
    
    Upstream version 1.1.10+dfsg
    
    Conflicts:
    	doc/libmatheval.info
    	doc/libmatheval.texi

 doc/libmatheval.info | 2185 --------------------------------------------------
 doc/libmatheval.texi | 2047 ----------------------------------------------
 2 files changed, 4232 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libmatheval.git