[Pkg-privacy-commits] [tails-installer] 01/02: Merge branch 'tails/jessie' of git.tails.boum.org:liveusb-creator into tails/jessie

[Ulrike Uhlig]

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

ulrike pushed a commit to branch debian/sid
in repository tails-installer.

commit 2435afc205ed65dd24b4fc4141696a66f0d289b4
Merge: cf49df0 5591a55
Author: Ulrike Uhlig <u at 451f.org>
Date:   Thu May 25 12:12:50 2017 +0200

    Merge branch 'tails/jessie' of git.tails.boum.org:liveusb-creator into tails/jessie

 data/tails-installer.appdata.xml | 33 ++++++++++++++++++++++++++++
 debian/changelog                 | 36 ++++++++++++++++++++++++++++++
 debian/patches/10731.patch       | 47 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 po/es_AR.po                      | 19 ++++++++--------
 po/fa.po                         | 11 +++++-----
 po/pt.po                         | 11 +++++-----
 po/sv.po                         | 17 ++++++++-------
 setup.py                         |  1 +
 9 files changed, 148 insertions(+), 28 deletions(-)

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