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

Trivial merge