Merge branch 'MDL-46498_master-fix' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 05:29:05 +0000 (13:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 05:29:05 +0000 (13:29 +0800)

Trivial merge