Merge branch 'MDL-43390_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 00:22:40 +0000 (12:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 00:22:40 +0000 (12:22 +1200)
commit8d4da7c01031b590747d845965c5c9a27c1b9089
treef4a4b06b8a1b5b49e17f8c6258c95622856f0d70
parent9894b272c58fd7acecc4cdc16a928dda04ba0dee
parent10ccdfb8cdbacf1c7313a623f9e82ecd36ba6cee
Merge branch 'MDL-43390_master' of git://github.com/dmonllao/moodle