From 28b82e7ff7431f08935cb19ead18aed108e8fe9b Mon Sep 17 00:00:00 2001
From: Alexandre Antonino Gonçalves Martinazzo <alexandremartinazzo@gmail.com>
Date: Wed, 19 Sep 2007 20:21:26 +0000
Subject: Merge branch 'mywork' into mymerge

---
(limited to 'locale/zh_CN/activity.linfo')

--
cgit v0.9.1