[pyzo] 10/19: Merge branch 'master' of github.com:pyzo/pyzo

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository pyzo.

commit 4f2a5a271844c04168cc66431d0aa8e2b183145a
Merge: f46ffa4 6a49a55
Author: Almar Klein <almar.klein at gmail.com>
Date:   Thu Jun 23 23:09:47 2016 +0200

    Merge branch 'master' of github.com:pyzo/pyzo

 pyzo/__init__.py            | 72 ++++++++++++++++++++++-----------------------
 pyzo/resources/pyzo.desktop | 14 +++++++++
 2 files changed, 50 insertions(+), 36 deletions(-)

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