[rospkg] 01/02: Merge tag 'upstream/1.0.37'

[Jochen Sprickerhof]

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

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

commit 087b8a4b7762b38060c8c9c77ee857b8bc60d412
Merge: 2b6d7f5 dc911d9
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Oct 13 12:06:07 2015 +0200

    Merge tag 'upstream/1.0.37'
    
    Upstream version 1.0.37

 src/rospkg/_version.py  |  2 +-
 src/rospkg/os_detect.py | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-
 src/rospkg/rospack.py   |  8 +++++++
 3 files changed, 67 insertions(+), 2 deletions(-)

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