[Pkg-anonymity-tools] [onionshare] 57/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 53a965a1433271b4392e9a96257df96aca707ee3
Merge: 13bd114 8666fb7
Author: Micah Lee <micah at micahflee.com>
Date:   Sat Aug 30 00:06:09 2014 +0000

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

 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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