Merge branch 'MDL-40990' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Mar 2015 00:22:06 +0000 (08:22 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 Mar 2015 00:22:06 +0000 (08:22 +0800)

Trivial merge