[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130610044748-hbi9z87lwvg0s6l4
2013-06-10 10:17:48 +05:30
parent 8f5433c990 70f16ce73b
commit 315e725e02
3 changed files with 392 additions and 344 deletions
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
+"X-Launchpad-Export-Date: 2013-06-08 05:52+0000\n"
 "X-Generator: Launchpad (build 16667)\n"

 #. module: crm_helpdesk