[Pkg-anonymity-tools] [onionshare] 96/140: Merge branch '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 5a5f1f04809fe57f7f41fbeaf988dadf77912585
Merge: b74a685 2cf6bd9
Author: Micah Lee <micah at micahflee.com>
Date:   Mon Sep 15 18:44:54 2014 +0000

    Merge branch 'kkka-cli-auto-exit'

 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