[pywps] 02/05: Merge tag 'upstream/3.2.6'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pywps.

commit d137d0d5a6b81bc3f3d3be9d5f270502b24a8e84
Merge: a4bacdd d5d1ff8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jun 30 19:14:56 2016 +0200

    Merge tag 'upstream/3.2.6'
    
    Upstream version 3.2.6
    
    Conflicts:
    	debian/changelog
    	debian/control

 doc/source/conf.py            | 2 +-
 pywps/Wps/Execute/__init__.py | 9 ++++++---
 rpm/pywps.changes             | 4 ++++
 rpm/pywps.spec                | 4 ++--
 setup.py                      | 2 +-
 wps.py                        | 2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pywps.git