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

[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 9ca4f914dea9a73e456bc46dbd1c44235ac1137e
Merge: 2d37f8d d03867e
Author: Micah Lee <micah at micahflee.com>
Date:   Sun Aug 10 17:57:14 2014 -0400

    Merge branch 'master' into troubadoour-master

 share/torbrowser-launcher/erinn.asc        |  51 +++++++++++
 share/torbrowser-launcher/mike-2013-09.asc | 130 -----------------------------
 torbrowser-launcher                        |  19 ++++-
 3 files changed, 66 insertions(+), 134 deletions(-)

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