[Pkg-anonymity-tools] [torbrowser-launcher] 13/14: Merge tag 'v0.2.0' into debian

[Ulrike Uhlig]

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

u-guest pushed a commit to annotated tag debian/0.2.0-1
in repository torbrowser-launcher.

commit 5d8a9cfa1065b931f581f9fc978a2eaecbf3e26c
Merge: 46094ed 068ea1a
Author: Ulrike Uhlig <u at 451f.org>
Date:   Thu May 14 22:17:42 2015 +0200

    Merge tag 'v0.2.0' into debian
    
    Version 0.2.0

 .gitignore                            |  2 ++
 BUILD.md                              |  2 +-
 CHANGELOG.md                          |  8 ++++++++
 apparmor/torbrowser.Browser.firefox   |  1 +
 build_rpm.sh                          |  2 +-
 share/applications/torbrowser.desktop |  1 -
 share/torbrowser-launcher/version     |  2 +-
 torbrowser_launcher/common.py         | 10 ++++------
 torbrowser_launcher/launcher.py       | 15 ++++-----------
 torbrowser_launcher/settings.py       | 13 -------------
 10 files changed, 22 insertions(+), 34 deletions(-)

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