[Pkg-anonymity-tools] [onionshare] 13/57: Merge branch 'hidden-id-respect-fellow-hs'

[Ulrike Uhlig]

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

u-guest pushed a commit to annotated tag 0.7
in repository onionshare.

commit dc9d88c327f585e2bcf0d6f6b4f78d0bd66cf160
Merge: 62d8188 a70ddac
Author: Micah Lee <micah at micahflee.com>
Date:   Mon Nov 17 10:55:21 2014 -0800

    Merge branch 'hidden-id-respect-fellow-hs'

 onionshare/onionshare.py | 78 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 22 deletions(-)

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