[Pkg-mozext-commits] [firetray] 249/399: Merge branch 'master' of https://github.com/SeniorSpielbergo/FireTray into SeniorSpielbergo-master

[David Prévot]

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

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit 5a591834cc46bd47e966fd4a215007e0374bf296
Merge: 7017968 8cdb609
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Thu May 24 19:21:38 2012 +0200

    Merge branch 'master' of https://github.com/SeniorSpielbergo/FireTray into SeniorSpielbergo-master

 src/chrome/content/options.js       |   22 +++++++++++++++++++++
 src/chrome/content/options.xul      |   29 ++++++++++++++++++++++++++++
 src/chrome/locale/en-US/options.dtd |    4 ++++
 src/defaults/preferences/prefs.js   |    2 ++
 src/modules/FiretrayMessaging.jsm   |   36 +++++++++++++++++++++++++++++++++++
 5 files changed, 93 insertions(+)

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