Merge branch 'MDL-48248-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 05:02:34 +0000 (13:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 05:02:34 +0000 (13:02 +0800)
commitedf842a46225150ba030927a2ebc814130bbbac8
treeff9fd6289e138acd5f551a61eb4c0685e3bc3660
parent571f30b376d7c0f9f1d871e3c8132cde126f0a57
parentb8f414c29fdbf47ca8e1f62bc7e016a0760ab4b2
Merge branch 'MDL-48248-master' of git://github.com/FMCorz/moodle