Merge branch 'MDL-49445' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 07:38:02 +0000 (15:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 07:38:02 +0000 (15:38 +0800)

Trivial merge