Merge branch 'MDL-47208' of git://github.com/aolley/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 04:25:32 +0000 (12:25 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 04:25:32 +0000 (12:25 +0800)

Trivial merge