Merge branch 'MDL-54640_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 01:04:05 +0000 (09:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 01:04:05 +0000 (09:04 +0800)
commitc879ff69f480fa16c6750ee61c66e8ffe8ed939c
treefd296772ee710cdb7fa821007480bca9d922e696
parent5ba78f62316e32ea10c481405fd48d7a9f6e53ec
parent442a3651ec71a29aab639292691a6b0e3861c273
Merge branch 'MDL-54640_master' of git://github.com/dmonllao/moodle