[med-svn] [khmer] 04/04: Merge tag 'upstream/1.4+dfsg'

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository khmer.

commit b04fcb4dcaada444d2027eb86352e5fe18183690
Merge: 246f8a7 e7775ef
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Wed May 27 20:43:08 2015 -0400

    Merge tag 'upstream/1.4+dfsg'
    
    Upstream version 1.4+dfsg


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/khmer.git