[pybind11] 01/07: Merge tag 'upstream/2.1.1' into experimental

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch experimental
in repository pybind11.

commit 57fa60a1f2bfaedc0438f5adc290d2ee345b761c
Merge: 43f9b17 aeee672
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Jul 20 10:55:17 2017 +0100

    Merge tag 'upstream/2.1.1' into experimental
    
    Upstream version 2.1.1
    
    # gpg: Signature made Thu 20 Jul 2017 10:55:12 BST
    # gpg:                using RSA key F3DB8E7525060E1BDB84C20D6A990FB3DDEB910A
    # gpg:                issuer "ghisvail at gmail.com"
    # gpg: Good signature from "Ghislain Antony Vaillant <ghisvail at gmail.com>" [ultimate]

 docs/changelog.rst        | 7 +++++++
 docs/conf.py              | 2 +-
 include/pybind11/common.h | 4 ++--
 pybind11/_version.py      | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

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