Merge branch 'MDL-55161-m' of https://github.com/micaherne/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 18:00:18 +0000 (20:00 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 18:00:18 +0000 (20:00 +0200)
commitd66e54b02168e230cac2235bd771e81244dacba0
tree71f6e10a429b312241e81137850dc844bab948c2
parent90f3675d9c85febf5330bb07bba226138bc8e891
parentb4beaed9319079b6df33f8209d78fdd0a25dbda2
Merge branch 'MDL-55161-m' of https://github.com/micaherne/moodle