[Pkg-anonymity-tools] [onionshare] 69/140: Merge pull request #120 from r4v5/fix-travis

[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 3ce43a65b6b6bf4eea1cbb93dc3abbb691214e2b
Merge: a6e99fc 15a917c
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Sep 2 17:12:05 2014 -0700

    Merge pull request #120 from r4v5/fix-travis
    
    Fix the travis build

 .gitignore              | 4 ++++
 .travis.yml             | 4 ++--
 test/onionshare_test.py | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)


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