[Pkg-anonymity-tools] [torbrowser-launcher] 06/07: Merge tag 'v0.1.6' 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 ce96a2f96349be21d827ff2ab1f9e7f720ab541b
Merge: 6f36665 ba53005
Author: Ulrike Uhlig <u at 451f.org>
Date:   Tue Oct 21 23:04:59 2014 +0200

    Merge tag 'v0.1.6' into debian
    
    Version 0.1.6

 CHANGELOG.md                                   | 6 ++++++
 setup.py                                       | 2 +-
 share/applications/torbrowser-settings.desktop | 1 -
 share/applications/torbrowser.desktop          | 1 -
 share/torbrowser-launcher/version              | 2 +-
 torbrowser_launcher/__init__.py                | 2 +-
 torbrowser_launcher/common.py                  | 4 +---
 7 files changed, 10 insertions(+), 8 deletions(-)

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