Merge branch 'MDL-31102' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 08:30:48 +0000 (16:30 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 08:30:48 +0000 (16:30 +0800)
commitb1baa8a2f20301128de8321f14daddb93a48be6b
treeaf0e66f2738ad5eefba718c50c723350b3c13236
parent12fd545a01ad6af59a311bc670f4e79964bcac81
parent079caafc160ac86f606db0dfcd34e42ac0b87839
Merge branch 'MDL-31102' of git://github.com/timhunt/moodle