[Pkg-privacy-commits] [tails-installer] 06/24: Merge branch 'develop' of git+ssh://git.fedorahosted.org/git/liveusb-creator 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.12.1
in repository tails-installer.

commit da73b0ecfcb298013218543c5c7a8d4f18d792d3
Merge: d3213fa 8abe99e
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Oct 16 14:35:15 2013 -0600

    Merge branch 'develop' of git+ssh://git.fedorahosted.org/git/liveusb-creator into develop
    
    Conflicts:
    	liveusb/gui.py

 liveusb/creator.py  | 52 ++++++++++++++++++++++++++--------------------------
 liveusb/gui.py      |  5 +++--
 liveusb/releases.py |  2 +-
 3 files changed, 30 insertions(+), 29 deletions(-)


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