[Pkg-privacy-commits] [onionshare] 36/53: Merge branch 'master' of github.com:micahflee/onionshare

[Ulrike Uhlig]

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

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

commit e7a9cd3d147d715e6ef4bc21f11ca4e399559388
Merge: 39cf82a df8e4f6
Author: Micah Lee <micah at micahflee.com>
Date:   Fri Nov 20 17:49:58 2015 -0800

    Merge branch 'master' of github.com:micahflee/onionshare

 onionshare/hs.py | 72 +++++++++++---------------------------------------------
 1 file changed, 14 insertions(+), 58 deletions(-)

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