[interactive-markers] 02/03: Merge tag 'upstream/1.11.1'

[Jochen Sprickerhof]

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

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

commit f14dcd2c43087f0c4bd2557e3aa965842564dea2
Merge: 9791159 129637f
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Aug 4 22:09:46 2015 +0200

    Merge tag 'upstream/1.11.1'
    
    Upstream version 1.11.1

 CHANGELOG.rst                                        | 12 +++++++++---
 package.xml                                          |  4 ++--
 src/interactive_markers/interactive_marker_server.py |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

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