[Pkg-mozext-commits] [nostalgy] 16/19: Merge tag 'upstream/0.2.32+4real'

[David Prévot]

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

taffit pushed a commit to branch master
in repository nostalgy.

commit f34e64f4404d68e2cc4a1e1118d4f9d450151692
Merge: e22178c 42d1e04
Author: David Prévot <taffit at debian.org>
Date:   Sat Aug 9 15:24:33 2014 -0400

    Merge tag 'upstream/0.2.32+4real'
    
    Upstream version 0.2.32+4real
    
    Conflicts:
    	components/nostalgy-autocomplete.js
    	content/edit_prefs.xul
    	content/edit_rule.xul
    	content/folders.js
    	install.rdf

 components/nostalgy-autocomplete.js |   7 ++
 content/edit_prefs.xul              |   1 +
 content/edit_rule.xul               |   2 +
 content/folders.js                  | 151 ++++++++++--------------------------
 content/messageOverlay.xul          |   1 +
 content/nostalgy.js                 |   4 +-
 content/thunderbirdOverlay.xul      |   4 +-
 install.rdf                         |   4 +-
 8 files changed, 57 insertions(+), 117 deletions(-)

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