Merge branch 'MDL-46064_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 02:23:55 +0000 (10:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 02:23:55 +0000 (10:23 +0800)

Trivial merge