[Pkg-privacy-commits] [onionshare] 75/256: Merge branch 'u451f-master'

[Ulrike Uhlig]

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

ulrike pushed a commit to branch master
in repository onionshare.

commit eece9641a794bfad4d08f725d9011a70d5cbd426
Merge: 12acb89 6cceac3
Author: Micah Lee <micah at micahflee.com>
Date:   Sun Jan 22 09:26:30 2017 -0800

    Merge branch 'u451f-master'

 apparmor/abstractions/onionshare | 18 ++++++++----------
 apparmor/usr.bin.onionshare      |  2 +-
 apparmor/usr.bin.onionshare-gui  |  8 +++++---
 3 files changed, 14 insertions(+), 14 deletions(-)

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