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

[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-rospkg.

commit f82c06be89cd96ef2b72c46fbbf3fd45bfcc2746
Merge: 69bfc63 94c7325
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Jul 10 23:14:15 2016 +0200

    Merge tag 'upstream/1.0.39'
    
    Upstream version 1.0.39

 doc/conf.py                   |  6 +++---
 src/rospkg/_version.py        |  2 +-
 src/rospkg/os_detect.py       | 20 ++++++++++++++++++--
 stdeb.cfg                     |  2 +-
 test/test_rospkg_os_detect.py |  2 +-
 5 files changed, 24 insertions(+), 8 deletions(-)

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