[Pkg-mozext-commits] [nostalgy] 224/235: Merge branch 'upstream' into wip

[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 7766d7b159fe1d829d5eea09c7b9c4abe586dfca
Merge: 3fea2fb 8779202
Author: David Prévot <taffit at debian.org>
Date:   Tue Oct 8 15:32:31 2013 -0400

    Merge branch 'upstream' into wip

 CHANGES                |    4 ++++
 content/edit_prefs.js  |    3 +++
 content/edit_prefs.xul |    4 ++--
 content/folders.js     |   34 ++++++++++++++++++++++------------
 content/nostalgy.js    |    2 +-
 install.rdf            |    6 +++---
 6 files changed, 35 insertions(+), 18 deletions(-)

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