[pyplusplus] 05/08: Merge tag 'upstream/1.7.0'

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository pyplusplus.

commit 5ca2e4e1837e2d3b242d69cacda4943a3ba9c9c1
Merge: e8412c1 8bf794f
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Sat Oct 29 19:34:48 2016 +0200

    Merge tag 'upstream/1.7.0'
    
    Upstream version 1.7.0

 .hg_archival.txt       |  6 ++----
 docs/conf.py           |  4 ++--
 docs/history.rst       | 10 ++++++++++
 pyplusplus/__init__.py |  2 +-
 setup.py               |  2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

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