| commit | 1924a86afaeca2ea4a60a563250c1a32e6579c03 | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Mon, 29 Aug 2011 00:13:40 +0000 (29 12:13 +1200) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Mon, 29 Aug 2011 00:13:40 +0000 (29 12:13 +1200) | ||
| tree | d05dfbf4cf98c749727b0f455959ac8113ab9cf8 | treesnapshot (tar.gz zip) |
| parent | 6843dea2e9d2e1960592075f40cb0a2bf8240c29 | commitdiff |
| parent | e0523b972901a140f7c0195648c154a2a2a382b8 | commitdiff |
Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution