[Pkg-anonymity-tools] [onionshare] 23/140: Merge branch '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 0f75e0e8d2d6965db99112daa2879401c19342e3
Merge: 0bc7784 f3122f0
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Aug 26 16:56:04 2014 -0700

    Merge branch '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