Merge branch 'MDL-24255' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Jun 2011 07:51:59 +0000 (15:51 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Jun 2011 07:51:59 +0000 (15:51 +0800)
commit8a322fc19b21d63c4acd8f4fc7b601a0ba6aee17
tree52b8e40e749ca107ca949a09e9eb6077a82c017e
parentfe70d8814b5e937e6c02e00cdae44a1db4197436
parent2d6829727dc47ca0550c9bcb2413d3330e99099a
Merge branch 'MDL-24255' of git://github.com/timhunt/moodle