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

Trivial merge