[med-svn] [vista] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/vista

[Luis Ibanez]

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

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

commit 1a1d040eaf2a5021d39b19613807cfcb45c8e60b
Merge: 1d2b0cb 1cedd22
Author: Luis Ibanez <luis.ibanez at kitware.com>
Date:   Tue Jan 21 14:59:49 2014 -0500

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/vista
    
    Conflicts:
    	debian/rules


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