Merge branch 'MDL-35453' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 23 Jun 2014 04:29:36 +0000 (12:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 23 Jun 2014 04:29:36 +0000 (12:29 +0800)

Trivial merge