[pyzo] 39/68: 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 06f1a875762ba18c6c74924bb6548bc4de2e1f56
Merge: d53da0f fde0d61
Author: Almar Klein <almar.klein at gmail.com>
Date:   Fri Sep 16 00:22:53 2016 +0200

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

 pyzo/resources/translations/pyzo_fr_FR.tr    | 377 ++++++++++++++-------------
 pyzo/resources/translations/pyzo_fr_FR.tr.qm | Bin 45363 -> 48717 bytes
 pyzo/resources/translations/pyzo_zh_TW.tr    |  31 ++-
 3 files changed, 216 insertions(+), 192 deletions(-)

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