Merge branch 'MDL-25841' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:31:34 +0000 (10:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:31:34 +0000 (10:31 +0800)
commite53a87dcb59247df40c92f7a9a36ca0c34400576
tree6851c7123334640c1ef2726f51f07bce85dd02f9
parentab8bc2ee1cbbd29de2645cb91b3773ce54afa424
parent90c2f510311856ef96b664d3d134c2db357f2390
Merge branch 'MDL-25841' of git://github.com/timhunt/moodle