[Pkg-privacy-commits] [tails-installer] 03/06: Merge branch 'master' into debian

[anonym]

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

anonym-tails-guest pushed a commit to annotated tag debian/3.11.6+tails1-19
in repository tails-installer.

commit 65f855c8d650f402da9a727b475b53a9e439850f
Merge: 754b191 1f47510
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Aug 4 08:39:42 2015 +0000

    Merge branch 'master' into debian

 liveusb/config.py  |  1 +
 liveusb/creator.py | 52 ++++++++++++++++++++++++++++++++++++++--------------
 liveusb/gui.py     | 19 +++++++++++++++++--
 liveusb/utils.py   | 15 ++++++++++++++-
 4 files changed, 70 insertions(+), 17 deletions(-)

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