[Pkg-privacy-commits] [tails-installer] 29/70: Merge branch 'master' into feature/9005-Improve-tails-installer

[Ulrike Uhlig]

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

ulrike pushed a commit to annotated tag tails-installer_4.20
in repository tails-installer.

commit 683c5b53043e05d54192b9fc7b6ff45c622b36ef
Merge: 46de272 d36c68c
Author: Tails developers <amnesia at boum.org>
Date:   Fri May 13 19:03:16 2016 +0200

    Merge branch 'master' into feature/9005-Improve-tails-installer
    
    Conflicts:
    	tails_installer/gui.py

 tails_installer/creator.py | 2 ++
 1 file changed, 2 insertions(+)

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