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

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch debian-robotics
in repository catkin-pkg.

commit 17ceeb86ec9b9de1947f2332d7adeab12633a37b
Merge: 1a48e8a 082ff35
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Mon Jan 12 16:38:26 2015 +0100

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/catkin-pkg

 .travis.yml      | 12 ++++++------
 debian/changelog | 13 +++++++++++++
 debian/compat    |  4 ----
 debian/control   |  4 ++--
 debian/rules     |  7 -------
 debian/watch     |  7 -------
 6 files changed, 21 insertions(+), 26 deletions(-)

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