[ros-vcstools] 09/31: Merge branch 'master' of github.com:debrob/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 d63bdf7c4ab78e414ec8a60730099c093d0a4973
Merge: 2d91809 bf059f6
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Fri Nov 28 09:49:23 2014 +0100

    Merge branch 'master' of github.com:debrob/vcstools
    
    Conflicts:
    	.gitignore

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --cc .gitignore
index cb0633e,18c24e1..6b056ab
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,4 +1,7 @@@
  *.pyc
  .DS_Store
  .coverage
 -*~
 +build
 +dist
 +*.egg-info
++*~

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