[Pkg-privacy-commits] [torbrowser-launcher] 01/02: Merge remote-tracking branch 'origin/master' into debian/sid

[Holger Levsen]

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

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

commit f296a2ead97a4538c56088fe5bca0032a252b9fa
Merge: f2287c3 857d0b4
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jul 23 13:03:01 2016 -0400

    Merge remote-tracking branch 'origin/master' into debian/sid

 CHANGELOG.md                      | 4 ++++
 share/torbrowser-launcher/version | 2 +-
 torbrowser_launcher/settings.py   | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

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