Merge branch 'MDL-47167' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 07:41:39 +0000 (15:41 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 07:41:39 +0000 (15:41 +0800)

Trivial merge