Merge branch 'MDL-49998' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 1 May 2015 07:05:42 +0000 (15:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 1 May 2015 07:05:42 +0000 (15:05 +0800)

Trivial merge