[Pkg-privacy-commits] [tails-installer] 22/30: Merge branch 'master' into bugfix/12588-i18n-gtkbuilder

[anonym]

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

anonym-tails-guest pushed a commit to branch tails/jessie
in repository tails-installer.

commit be37b65b3828585a6d31e64025b5e50ae2182939
Merge: 7e14061 83fa64c
Author: intrigeri <intrigeri at boum.org>
Date:   Fri Jun 9 14:35:00 2017 +0000

    Merge branch 'master' into bugfix/12588-i18n-gtkbuilder

 po/fr.po                   | 149 ++++++++++++++++++++++++++-------------------
 tails_installer/creator.py |   7 ++-
 tails_installer/gui.py     |  10 +++
 3 files changed, 102 insertions(+), 64 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git