| commit | 77b6fb172d3099c54335e05e12859b5d8ca42950 | |
| author | Dieter Adriaenssens <ruleant@users.sourceforge.net> | |
| Fri, 10 Sep 2010 15:34:52 +0000 (10 17:34 +0200) | ||
| committer | Dieter Adriaenssens <ruleant@users.sourceforge.net> | |
| Fri, 10 Sep 2010 15:34:52 +0000 (10 17:34 +0200) | ||
| tree | f83201b1536126ec34f8641108518607a6497825 | treesnapshot (tar.gz zip) |
| parent | 7f598f4f4f562b392fe4a83d3e9fd9bf00379e37 | commitdiff |
| parent | 194e357a996310225364d311e6c27ed41db002bb | commitdiff |
Merge branch 'QA_3_3'
Conflicts:
ChangeLog
Conflicts:
ChangeLog
| ChangeLog | diff1 | diff2 | blobhistory |
| libraries/import.lib.php | diff1 | diff2 | blobhistory |