| commit | e14b73d23e20bd334e92180518ada71e6654f96d | |
| author | Madhura Jayaratne <madhura.cj@gmail.com> | |
| Sat, 18 Feb 2012 09:21:23 +0000 (18 14:51 +0530) | ||
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | |
| Sat, 18 Feb 2012 09:21:23 +0000 (18 14:51 +0530) | ||
| tree | 20ea1f777273965f4e5dc3c94dbc0484c1d14904 | treesnapshot (tar.gz zip) |
| parent | a4183c6da2c5a604aff5ed155a29f0ed2ad8db1d | commitdiff |
| parent | 0d1407f178dcd8cf97de424b3611b51043f08377 | commitdiff |
Merge branch 'QA_3_4' into QA_3_5
Conflicts:
libraries/common.lib.php
Conflicts:
libraries/common.lib.php
| ChangeLog | diff1 | diff2 | blobhistory |
| libraries/Error.class.php | diff1 | diff2 | blobhistory |
| libraries/common.lib.php | diff1 | diff2 | blobhistory |
| libraries/import/xml.php | diff1 | diff2 | blobhistory |