Merge branch 'MDL-45321' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 30 Apr 2014 07:25:22 +0000 (15:25 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 30 Apr 2014 07:25:22 +0000 (15:25 +0800)

Trivial merge