Merge branch 'MDL-49269-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:23:30 +0000 (08:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:23:30 +0000 (08:23 +0800)

Trivial merge