Merge branch 'MDL-52788-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 06:47:07 +0000 (14:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 06:47:07 +0000 (14:47 +0800)

Trivial merge