[Pkg-privacy-commits] [tails-installer] 34/35: Merge branch 'master' of github.com:lmacken/liveusb-creator

[anonym]

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

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

commit 44eac43f95c61504e124080de35446f9ecd3412a
Merge: 3753af3 8daf3b7
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Oct 16 14:33:08 2013 -0600

    Merge branch 'master' of github.com:lmacken/liveusb-creator
    
    Conflicts
    	data/liveusb-creator.nsi

 data/liveusb-creator.nsi | 3 +++
 1 file changed, 3 insertions(+)

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