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

[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 60589ece3f8780baa78a267f8d061a5112d1a49d
Merge: 1c2c3a1 162292c
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Oct 8 16:08:19 2015 +0200

    Merge tag 'upstream/1.0.36'
    
    Upstream version 1.0.36

 .travis.yml             |  3 +--
 doc/rospkg_packages.rst |  3 ++-
 src/rospkg/_version.py  |  2 +-
 src/rospkg/os_detect.py | 27 ++++++++++++++++++++-------
 src/rospkg/rospack.py   |  3 ++-
 5 files changed, 26 insertions(+), 12 deletions(-)

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