Merge branch 'MDL-49696-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 07:42:11 +0000 (15:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 07:42:11 +0000 (15:42 +0800)

Trivial merge