[Pkg-privacy-commits] [torbrowser-launcher] 06/08: Merge remote-tracking branch 'micahlee/master' into debian/proposed

[Holger Levsen]

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

holger pushed a commit to branch debian/proposed
in repository torbrowser-launcher.

commit bdef5721254a406b2ac7b8b8da185df9256929c9
Merge: 6783c10 1cb819e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Mar 1 16:41:41 2016 +0100

    Merge remote-tracking branch 'micahlee/master' into debian/proposed

 CHANGELOG.md                        | 2 +-
 apparmor/torbrowser.Browser.firefox | 4 ++++
 setup.py                            | 6 ++----
 torbrowser_launcher/common.py       | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

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