Merge branch 'MDL-53718' of git://github.com/aolley/moodle
commitd0cccb4fdb5b5b8dcebd2977f91ce8a2f11e0d3b
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Nov 2016 01:59:31 +0000 (8 09:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Nov 2016 01:59:31 +0000 (8 09:59 +0800)
tree5902a4d6453155dc12ad7bdffb470d15029bc130
parent42fe364f41db2352ca712e0bd5192e65a7f016cc
parentb4846b88d9cb90b6600a2868d6ad92ad80d0b060
Merge branch 'MDL-53718' of git://github.com/aolley/moodle