[Pkg-anonymity-tools] [torbrowser-launcher] 03/06: Merge branch 'master' into debian

[Holger Levsen]

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

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

commit c357674d4cb53fb3cf60aeab1cc3d3a0dd22097d
Merge: c1a0b62 e8350a1
Author: Micah Lee <micah at micahflee.com>
Date:   Thu Jul 10 17:23:38 2014 -0700

    Merge branch 'master' into debian

 .gitignore                                         |   1 +
 CHANGELOG.md                                       |   8 +
 README.md                                          |   7 +-
 build_deb.sh                                       |   2 +-
 build_rpm.sh                                       |   2 +-
 ppa_release.sh                                     |   4 +-
 requirements.txt                                   |   2 +
 setup.py                                           |  25 ++-
 .../applications/torbrowser-settings.desktop       |   0
 .../applications/torbrowser.desktop                |   0
 {img => share/pixmaps}/torbrowser32.xpm            |   0
 {img => share/pixmaps}/torbrowser80.xpm            |   0
 {keys => share/torbrowser-launcher}/alexandre.asc  |   0
 {keys => share/torbrowser-launcher}/erinn.asc      |   0
 .../torbrowser-launcher/locale}/en/messages.pot    |   0
 .../torbrowser-launcher/locale}/nl_NL/messages.pot |   0
 .../torbrowser-launcher/locale}/pl/messages.pot    |   0
 .../torbrowser-launcher}/mike-2013-09.asc          |   0
 {keys => share/torbrowser-launcher}/mike.asc       |   0
 .../torbrowser-launcher/mirrors.txt                |   0
 modem.ogg => share/torbrowser-launcher/modem.ogg   | Bin
 {keys => share/torbrowser-launcher}/sebastian.asc  |   0
 .../torbrowser-launcher/torproject.pem             |   0
 share/torbrowser-launcher/version                  |   1 +
 stdeb.cfg                                          |   4 +-
 torbrowser-launcher                                | 193 +++++++--------------
 version                                            |   1 -
 27 files changed, 102 insertions(+), 148 deletions(-)

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