Merge branch 'MDL-48884_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 06:43:49 +0000 (14:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 06:43:49 +0000 (14:43 +0800)

Trivial merge