[ros-rosinstall-generator] 01/02: Merge tag 'upstream/0.1.12'

[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-rosinstall-generator.

commit bee607b373dfad9828f1ebd7edb5ae36ad73d519
Merge: fc7cf1e 64bcc9b
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Jul 23 12:02:05 2016 +0200

    Merge tag 'upstream/0.1.12'
    
    Upstream version 0.1.12

 .travis.yml                           | 2 +-
 setup.py                              | 2 +-
 src/rosinstall_generator/__init__.py  | 2 +-
 src/rosinstall_generator/distro.py    | 4 ++--
 src/rosinstall_generator/generator.py | 4 +++-
 stdeb.cfg                             | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

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