Merge branch 'MDL-54059-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 25 May 2016 08:17:44 +0000 (16:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 May 2016 08:17:44 +0000 (16:17 +0800)
commit3f59e20eebaec20203aa41328ef2f73afc7a73c9
tree297cb651c9ec6261216969f8977ce1728b54df85
parent979d5c06032db6d5c8eeb77c9207c7f20263e3e3
parentc366cb08cf39a223750f81359c8c201422415087
Merge branch 'MDL-54059-master' of git://github.com/andrewnicols/moodle