[Pkg-mozext-commits] [personasplus] 25/42: Merge branch 'master' into bug-861089

[David Prévot]

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

taffit pushed a commit to branch master
in repository personasplus.

commit 8eed71d37f5cd0a2c63a592a2f6af3db309a9f8a
Merge: 10613b7 3ca6118
Author: Kris Maglione <maglione.k at gmail.com>
Date:   Wed Apr 17 12:22:58 2013 -0700

    Merge branch 'master' into bug-861089

 extension/content/personas.js              | 2 +-
 extension/content/preferences.xul          | 4 ++--
 extension/locale/en-US/personas.properties | 2 +-
 extension/locale/en-US/preferences.dtd     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


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