Merge branch 'MDL-50958-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Aug 2015 07:40:10 +0000 (15:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Aug 2015 07:40:10 +0000 (15:40 +0800)

Trivial merge