[med-svn] [khmer] 04/04: Merge remote-tracking branch 'origin/master'

[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 912a085b3fed2cb0f7e762caaab176e85e613273
Merge: 3f257a4 2a4eb71
Author: Michael R. Crusoe <mcrusoe at msu.edu>
Date:   Sat Jan 31 09:12:02 2015 -0500

    Merge remote-tracking branch 'origin/master'


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