[Pkg-mozext-commits] [nostalgy] 12/15: Merge branch 'upstream'

[Guido Guenther]

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

agx pushed a commit to annotated tag debian/0.2.32-1
in repository nostalgy.

commit d4e41a4af217cd2870033109a5b4a47a6d9b9589
Merge: 34cd8fa 902df34
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Jul 14 13:01:28 2014 +0200

    Merge branch 'upstream'
    
    Conflicts:
    	CHANGES
    	install.rdf

 CHANGES                             |   3 +
 chrome.manifest                     |   2 +
 chrome.manifest.pack                |   2 +
 components/nostalgy-autocomplete.js |  70 ++++++++++++++++++
 config_build.sh                     |   2 +-
 content/edit_prefs.xul              |   1 +
 content/edit_rule.xul               |   2 +
 content/folders.js                  | 144 ++++++++++++++++--------------------
 content/messageOverlay.xul          |   1 +
 content/nostalgy.js                 |   4 +-
 content/thunderbirdOverlay.xul      |   1 +
 files                               |   1 +
 install.rdf                         |   4 +-
 13 files changed, 150 insertions(+), 87 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/nostalgy.git