Merge branch 'MDL-38380_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE
commita9cb8b73c88489fc103c019ad96b5490bb608b4e
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 05:24:47 +0000 (26 13:24 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 05:24:47 +0000 (26 13:24 +0800)
tree0b527f00488b1b88172f2b8947d74d22d0cf5707
parent0e91ef2d66de83a97c1454791578d6992fcf8c00
parent2ff2d96916b1166b6a755475158c781f6e148453
Merge branch 'MDL-38380_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE