Merge branch 'MDL-43558_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 7 Apr 2015 08:25:07 +0000 (16:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 7 Apr 2015 08:25:07 +0000 (16:25 +0800)

Trivial merge