[Pkg-mozext-commits] [firebug] 07/30: Merge branch 'master' of https://github.com/firebug/firebug

[David Prévot]

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

taffit pushed a commit to branch master
in repository firebug.

commit 27babeff0c1436b8fb1052b8d7c507e2c23d6ff8
Merge: f1e0811 31ea74a
Author: Farshid Beheshti <farshid.beheshti at gmail.com>
Date:   Wed Jun 4 17:02:01 2014 +0430

    Merge branch 'master' of https://github.com/firebug/firebug

 extension/locale/zh-CN/cookies.properties     |  34 ++--
 extension/locale/zh-CN/firebug-amo.properties |   4 +-
 extension/locale/zh-CN/firebug.properties     | 259 +++++++++++++++++++-------
 extension/locale/zh-CN/keys.properties        |  12 ++
 extension/locale/zh-CN/selectors.properties   |   3 +
 5 files changed, 229 insertions(+), 83 deletions(-)

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