Merge branch 'MDL-56584-master-fix1' of http://github.com/damyon/moodle
commit0d9d55a3ad402a615a1fa580b472814f00c65367
authorDavid Monllao <davidm@moodle.com>
Fri, 25 Nov 2016 03:15:32 +0000 (25 11:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 25 Nov 2016 03:15:32 +0000 (25 11:15 +0800)
treee8f4d34dcb43e9eb7db1660529c6de02742eb2fc
parentb4f82837ba53fba88bbe1a1cc30b46dc099fcf8a
parent262253f6241cb7ddbdba733de36422eab578169d
Merge branch 'MDL-56584-master-fix1' of github.com/damyon/moodle