Merge branch 'MDL-39445_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commita20eeda845e3460039da866088d8dc3f02215c6c
authorDamyon Wiese <damyon@moodle.com>
Mon, 6 May 2013 07:17:13 +0000 (6 15:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 6 May 2013 07:17:13 +0000 (6 15:17 +0800)
tree74cadd01afa426eb771c7c54270313376cc0ac0e
parent56463941a8357d5b87f00b2ee2bc2b4397ecb856
parent2ec2d00dc8f1de785b6476a94ddc3fd9d2c11782
Merge branch 'MDL-39445_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE