[Pkg-anonymity-tools] [onionshare] 19/140: 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 master
in repository onionshare.

commit 28a05d9de21a4849a646a4a65d1226b6937bb251
Merge: 5a3957d 1067df9
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Aug 26 15:22:23 2014 -0700

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

 onionshare/onionshare.py         |  7 ++++---
 onionshare/strings.json          | 10 +++++++++-
 onionshare_gui/onionshare_gui.py | 13 ++++++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)

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