Merge branch 'MDL-49934-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 00:39:15 +0000 (08:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 00:39:15 +0000 (08:39 +0800)

Trivial merge