[Pkg-privacy-commits] [torbirdy] 18/22: Merge tag 'upstream/0.2.2' into debian/sid

[Ulrike Uhlig]

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

ulrike pushed a commit to branch debian/sid
in repository torbirdy.

commit e7a788b716c12274c92078b51dcd3ea17d6b3361
Merge: a3872c8 e6f5eda
Author: Ulrike Uhlig <u at 451f.org>
Date:   Wed Apr 19 12:20:46 2017 +0200

    Merge tag 'upstream/0.2.2' into debian/sid
    
    Upstream version 0.2.2
    
    Conflicts:
    	ChangeLog
    	README.RELEASE

 ChangeLog                     | 11 +++++-
 LICENSE                       |  2 +-
 README                        |  3 +-
 README.RELEASE                |  5 ++-
 chrome/content/emailwizard.js |  2 +-
 chrome/content/feedwizard.js  |  2 +-
 chrome/content/nntpwizard.js  |  2 +-
 chrome/content/overlay.js     |  1 +
 chrome/content/preferences.js | 15 ++++---
 components/torbirdy.js        | 14 +++----
 defaults/preferences/prefs.js |  1 +
 gpg.conf                      | 91 +++++++++++++++++++++++++++++++++++++++++++
 import-translations.sh        | 26 +++++++++++++
 install.rdf                   |  9 +++--
 14 files changed, 156 insertions(+), 28 deletions(-)

diff --cc ChangeLog
index 07774ae,cdcd53b..ffb3c48
--- a/ChangeLog
+++ b/ChangeLog
@@@ -61,7 -68,7 +68,7 @@@
      * Italian
      * Korean
      * Latvian
--    * Norwegian Bokmål 
++    * Norwegian Bokmål
      * Norwegian Nynorsk
      * Punjabi
      * Polish

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