[MERGE]: Merged with addons

bzr revid: atp@tinyerp.com-20131101111834-x804u2ds0o6eo5m9
bzr revid: atp@tinyerp.com-20131108105510-vl6d8ehp6kqffkry

diff --cc addons/crm/i18n/zh_CN.po
index 7130bd3,ea121b0..66d0e00
--- 1/addons/crm/i18n/zh_CN.po
--- 2/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@@ -7,14 -7,14 +7,14 @@@ msgstr "
  "Project-Id-Version: OpenERP Server 6.0dev\n"
  "Report-Msgid-Bugs-To: support@openerp.com\n"
  "POT-Creation-Date: 2012-12-21 17:04+0000\n"
- "PO-Revision-Date: 2013-08-06 09:41+0000\n"
- "Last-Translator: fanvil <fanvil@hotmail.com>\n"
 -"PO-Revision-Date: 2013-11-08 09:14+0000\n"
 -"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
++"PO-Revision-Date: 2013-11-01 16:08+0000\n"
++"Last-Translator: dcc <congcn.com@gmail.com>\n"
  "Language-Team: \n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2013-09-12 05:18+0000\n"
- "X-Generator: Launchpad (build 16761)\n"
 -"X-Launchpad-Export-Date: 2013-11-10 05:53+0000\n"
++"X-Launchpad-Export-Date: 2013-11-02 05:57+0000\n"
+ "X-Generator: Launchpad (build 16820)\n"
  
  #. module: crm
  #: view:crm.lead.report:0