Merge branch 'MDL-47143' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 08:13:33 +0000 (16:13 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 08:13:33 +0000 (16:13 +0800)

Trivial merge