[ros-rospkg] 01/02: Merge tag 'upstream/1.0.40'

[Jochen Sprickerhof]

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

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

commit fd91528960a6331eac3db27dca1cd1d4dde87718
Merge: c9d530e 0e874d7
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Sep 2 11:42:47 2016 +0200

    Merge tag 'upstream/1.0.40'
    
    Upstream version 1.0.40

 doc/os_detect.rst                          |  5 +++++
 src/rospkg/_version.py                     |  2 +-
 src/rospkg/environment.py                  |  2 +-
 src/rospkg/os_detect.py                    | 23 +++++++++++++++++++++++
 stdeb.cfg                                  |  2 +-
 test/os_detect/slackware/slackware-version |  1 +
 test/test_rospkg_os_detect.py              | 29 +++++++++++++++++++++++++++++
 7 files changed, 61 insertions(+), 3 deletions(-)

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