[ros-vcstools] 25/31: Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/vcstools

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository ros-vcstools.

commit e106fe1d4ffd8efe13430504c42391ad6dbc7607
Merge: 3f707be 19909cc
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Tue Jan 27 12:54:29 2015 +0100

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

 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --cc debian/changelog
index b307663,a15c911..90bb2a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,12 +1,18 @@@
  vcstools (0.1.36-1) UNRELEASED; urgency=medium
  
+   [ Leopold Palomo-Avellaneda ]
 -  * Imported Upstream version 0.1.35
 +  * Update Uploaders and Maintainer field
 +  * Increase Standards-Version to 3.9.6
 +  * Added VCS fields
 +  * Added Homepage field
 +  * Added Python version supported
 +  * Updated Description field
 +  * Updated copyright file
+ 
+   [ Jochen Sprickerhof ]
    * Imported Upstream version 0.1.36
  
 - -- Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>  Mon, 15 Dec 2014 15:13:03 +0100
 + -- Leopold Palomo-Avellaneda <leo at alaxarxa.net>  Tue, 27 Jan 2015 09:37:22 +0100
  
  vcstools (0.1.35-1.drp70+1) wheezy-robotics; urgency=medium
  

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