Merge branch 'MDL-50032-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 02:55:18 +0000 (10:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 02:55:18 +0000 (10:55 +0800)

Trivial merge