[med-svn] [probabel] 03/03: Commit of merge after importing upstream pristine tar for v0.4.2.

[Lennart Karssen]

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

lckarssen-guest pushed a commit to branch master
in repository probabel.

commit 5f7d7de5b4b61a9feb9985079ee0665813cdeab4
Merge: 9a74b8c f410ae2
Author: L.C. Karssen <lennart at karssen.org>
Date:   Tue Jan 14 16:26:31 2014 +0100

    Commit of merge after importing upstream pristine tar for v0.4.2.
    
    Merge tag 'upstream/0.4.2'
    
    Upstream version 0.4.2
    
    Conflicts:
            doc/Makefile.in
            src/Makefile.in


-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/probabel.git