[Pkg-anonymity-tools] [onionshare] 126/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 ffa3db72ec2f684fcf8855b084314b1eaae6851e
Merge: 0999bd6 df9c763
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Sep 23 00:52:24 2014 +0000

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

 locale/nl.json | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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