Merge branch 'MDL-55283-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 21:04:03 +0000 (05:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 21:04:03 +0000 (05:04 +0800)
commit8bb1a64ad5d058fdc9b30c96f7ec7badcf9b0d41
treea3559ef36a570f270424a73877938395fc71fd01
parent286a391b866000085778c174cb1fc38dec611beb
parentb2c2d18b28dc0d4dfadf15e8ad91693bb7b2ad1f
Merge branch 'MDL-55283-master' of git://github.com/andrewnicols/moodle