Merge branch 'MDL-52051-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 11 Oct 2016 09:11:21 +0000 (17:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 11 Oct 2016 09:11:21 +0000 (17:11 +0800)
commitb65c33ace579887a3fae3d03cb3de2d38a546239
treed72ea9fc932671950ae14c4e88ee4ed71bc40b65
parent988ff9f57f2bb06d463d6c440732bd2b53bc38b7
parent066963cd183df684303f626061004c13124e2fe3
Merge branch 'MDL-52051-master' of git://github.com/andrewnicols/moodle