Merge branch 'MDL-55084' of git://github.com/prg3/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:06:38 +0000 (15:06 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:06:38 +0000 (15:06 +0200)

Trivial merge