[ros-xacro] 01/02: Merge tag 'upstream/1.11.1'

[Jochen Sprickerhof]

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

jspricke pushed a commit to branch master
in repository ros-xacro.

commit cf782ecc5a4cf98303e41d72355faaafd46e6c8a
Merge: 337fd9d 1050cb2
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Dec 4 18:23:47 2016 +0100

    Merge tag 'upstream/1.11.1'
    
    Upstream version 1.11.1

 CHANGELOG.rst                        | 23 ++++++++++++
 package.xml                          |  2 +-
 src/xacro/__init__.py                | 71 ++++++++++++++++++++++--------------
 src/xacro/cli.py                     |  2 +-
 test/test-xacro-cmake/CMakeLists.txt |  2 +-
 test/test_xacro.py                   | 55 +++++++++++++++-------------
 6 files changed, 100 insertions(+), 55 deletions(-)

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