Merge branch 'MDL-26242' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 07:13:53 +0000 (15:13 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Feb 2011 07:13:53 +0000 (15:13 +0800)
commit89652edd6ce7ae5307c32eeffd453f6943e2ac38
tree29dbcf565f93545ec8e56a2274caa96dd8542dbf
parent449adacbc3b0ebc99e62c5ad7d70168f787f02e4
parent5f11e00db1c94c6993ea57fdbc319df1db36c94a
Merge branch 'MDL-26242' of git://github.com/timhunt/moodle