Merge branch 'MDL-25884' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:20:22 +0000 (10:20 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:20:22 +0000 (10:20 +0800)
commitab8bc2ee1cbbd29de2645cb91b3773ce54afa424
tree12b33edfc66f362e31fd6bfeb7ffcca868353282
parent34b681701ae15caf3296aa1a7bde38d7b26fa907
parent151c2284dd5252feec3d38338c828ff1e7f3ad09
Merge branch 'MDL-25884' of git://github.com/timhunt/moodle