[pyzo] 13/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 57654d6fb50a0b678fc84a6f340bf86e8d5ac16d
Merge: 78f403f 1a9f053
Author: Almar Klein <almar.klein at gmail.com>
Date:   Mon Jun 27 16:19:48 2016 +0200

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

 pyzo/resources/translations/pyzo_zh_TW.tr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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