[Pkg-privacy-commits] [vidalia] 34/160: Merge branch 'master' of ssh://git.debian.org/git/collab-maint/vidalia

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository vidalia.

commit e05f1410478f4f5d931a4bcc9f2215344267026e
Merge: ecad831 f0929ad
Author: Dererk <dererk at melee.dererk.com.ar>
Date:   Sun Sep 26 23:57:04 2010 -0300

    Merge branch 'master' of ssh://git.debian.org/git/collab-maint/vidalia

 debian/0.2.x/po/zh_CN.po                                             | 4 ++--
 debian/0.2.x/po/zh_TW.po                                             | 4 ++--
 testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_CN.po | 4 ++--
 testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_TW.po | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git