Merge branch 'MDL-38757-master-int' of git://github.com/FMCorz/moodle
commitdec909fcdd357344ebb9a22843e52474059fb884
authorDamyon Wiese <damyon@moodle.com>
Fri, 10 May 2013 01:35:44 +0000 (10 09:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 10 May 2013 01:35:44 +0000 (10 09:35 +0800)
tree43ce96e9766074c8ac686e8c4d009db664067d59
parentda2cff35c508406fb058dcd8acb401e39073f325
parent9fba8698364a8ff34f3c6c90905d00ab00303ed8
Merge branch 'MDL-38757-master-int' of git://github.com/FMCorz/moodle