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

[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 7ed290021bf56b78b791e9c1611339fc92be531f
Merge: e32a9ad e26663a
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Oct 23 10:55:13 2015 +0200

    Merge tag 'upstream/1.0.38'
    
    Upstream version 1.0.38

 src/rospkg/_version.py  | 2 +-
 src/rospkg/os_detect.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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