Merge branch 'MDL-48215_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 05:23:30 +0000 (13:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 05:23:30 +0000 (13:23 +0800)

Trivial merge