[med-svn] [vista] 04/04: Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/debian-med/vista into pristine-tar

[Luis Ibanez]

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

luisibanez-guest pushed a commit to branch pristine-tar
in repository vista.

commit 117a749b5c5de0808fcfc6914ec011a52daac14b
Merge: cdafd30 a14cdc6
Author: Luis Ibanez <luis.ibanez at kitware.com>
Date:   Mon Jan 6 19:44:52 2014 -0500

    Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/debian-med/vista into pristine-tar
    
    Conflicts:
    	vista-foia_0.20131218.orig.tar.gz.id


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