Merge branch 'QA_4_0'
commit73b83321d6b5c0580764776148a4a1368055a246
authorMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 19 Apr 2013 06:21:14 +0000 (19 11:51 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 19 Apr 2013 06:21:14 +0000 (19 11:51 +0530)
tree191ffdfc179123eac5207393d7df86c1b6275488
parente8e4b6a75e2ab08eae6c157fd67169d7f2f92c7a
parentaef391032f23b3fa66e6da3be33ebbc04877a997
Merge branch 'QA_4_0'

Conflicts:
po/pt.po