Merge branch 'MDL-50153-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 8 May 2015 05:21:29 +0000 (13:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 8 May 2015 05:21:29 +0000 (13:21 +0800)

Trivial merge