[Pkg-anonymity-tools] [onionshare] 22/140: Merge branch 'master' of https://github.com/r4v5/onionshare into r4v5-master

[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 f3122f0de808a1da94fde78aad710b7b6529a837
Merge: 0bc7784 9253163
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Aug 26 16:55:27 2014 -0700

    Merge branch 'master' of https://github.com/r4v5/onionshare into r4v5-master

 .travis.yml             | 10 ++++++++++
 test/onionshare_test.py | 34 ----------------------------------
 2 files changed, 10 insertions(+), 34 deletions(-)

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