[Pkg-privacy-commits] [onionshare] 05/33: Merge branch 'master' of github.com:micahflee/onionshare

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository onionshare.

commit 4be8d68750579729106ccec00d77804fbd625cb8
Merge: 210448d 886c307
Author: Micah Lee <micah at micahflee.com>
Date:   Tue May 19 13:34:48 2015 -0700

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

 install/build_exe.bat  | 4 ++--
 install/onionshare.nsi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git