[Pkg-privacy-commits] [tails-installer] 34/40: Merge branch 'master' into develop

[anonym]

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

anonym-tails-guest pushed a commit to annotated tag 3.13.1
in repository tails-installer.

commit 65bf5e986c7b4400b97ae1f552c995f8455a02c4
Merge: 1dc34da d18d9a5
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Nov 26 15:33:16 2014 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	MANIFEST.in

 LICENSE.txt | 45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

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