Merge branch 'MDL-6340' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 00:44:01 +0000 (08:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 00:44:01 +0000 (08:44 +0800)

Trivial merge