[Pkg-anonymity-tools] [onionshare] 95/140: Merge branch 'cli-auto-exit' of https://github.com/kkka/onionshare into kkka-cli-auto-exit

[Ulrike Uhlig]

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

u-guest pushed a commit to branch master
in repository onionshare.

commit 2cf6bd94e97224113042cb7436d6cd025c19b345
Merge: b74a685 e33cfd6
Author: Micah Lee <micah at micahflee.com>
Date:   Mon Sep 15 18:44:45 2014 +0000

    Merge branch 'cli-auto-exit' of https://github.com/kkka/onionshare into kkka-cli-auto-exit
    
    Conflicts:
    	onionshare/onionshare.py

 onionshare/onionshare.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/onionshare.git