| commit | ddceaedca2b46511f2722472237c03ac45cbb5f5 | |
| author | Madhura Jayaratne <madhura.cj@gmail.com> | |
| Sat, 13 Apr 2013 12:35:52 +0000 (13 18:05 +0530) | ||
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | |
| Sat, 13 Apr 2013 12:35:52 +0000 (13 18:05 +0530) | ||
| tree | 450f505a1316787553e47527c161d4ac22f10000 | treesnapshot (tar.gz zip) |
| parent | e3e1c052933d8f670be1c055937bd682e77aa27e | commitdiff |
| parent | bb025f887dd080dcb24655ae1f8309680b5d6d99 | commitdiff |
Merge branch 'QA_4_0'
Conflicts:
po/ko.po
po/ms.po
po/pt_BR.po
Conflicts:
po/ko.po
po/ms.po
po/pt_BR.po