[Pkg-anonymity-tools] [torbrowser-launcher] 10/11: Merge branch 'master' into debian

[Ulrike Uhlig]

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

u-guest pushed a commit to branch debian
in repository torbrowser-launcher.

commit d320ff2fdac09f3cc7d9cc8ada8a84d912bd6864
Merge: 6082d60 88a7053
Author: Ulrike Uhlig <u at 451f.org>
Date:   Mon Aug 11 20:46:25 2014 +0200

    Merge branch 'master' into debian

 CHANGELOG.md                               |   6 ++
 apparmor/torbrowser.Browser.firefox        | 107 +++++++++++++-----------
 share/torbrowser-launcher/erinn.asc        |  51 +++++++++++
 share/torbrowser-launcher/mike-2013-09.asc | 130 -----------------------------
 share/torbrowser-launcher/version          |   2 +-
 torbrowser-launcher                        |  19 ++++-
 6 files changed, 131 insertions(+), 184 deletions(-)

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