[ros-metapackages] 02/02: Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/ros-metapackages

[Wookey]

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

wookey pushed a commit to branch master
in repository ros-metapackages.

commit a86df85d6502e01b366d14d378b6954af6b2a82a
Merge: fd50565 e00d046
Author: Wookey <wookey at wookware.org>
Date:   Thu Nov 26 15:12:54 2015 +0000

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/ros-metapackages
    
    Conflicts:
    	debian/changelog


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-metapackages.git