This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pywps.
commit 4bf35691032512267739325df0571da3156ed57c Merge: 0fc764a 99fdd76 Author: Bas Couwenberg <[email protected]> Date: Thu Dec 8 07:49:18 2016 +0100 Merge tag 'upstream/4.0.0' Upstream version 4.0.0 Conflicts: debian/changelog VERSION.txt | 2 +- docs/demobuffer.py | 2 +- pywps/__init__.py | 2 +- pywps/app/WPSResponse.py | 2 +- tests/process.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pywps.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

