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

Trivial merge