[Pkg-privacy-commits] [torbrowser-launcher] 14/21: Merge branch 'boklm-use_torbrowser_updates_xml'

[Holger Levsen]

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

holger pushed a commit to annotated tag debian/0.2.1-1
in repository torbrowser-launcher.

commit e7145efb79f3bda411281e817a4810b917a3ad0f
Merge: a0634fa 5bed87d
Author: Micah Lee <micah at micahflee.com>
Date:   Thu Nov 5 19:19:05 2015 -0800

    Merge branch 'boklm-use_torbrowser_updates_xml'

 torbrowser_launcher/common.py   |  4 ++--
 torbrowser_launcher/launcher.py | 37 ++++++++++---------------------------
 2 files changed, 12 insertions(+), 29 deletions(-)

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