Merge branch 'MDL-45290-master-fix' of https://github.com/jethac/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 7 May 2014 05:28:20 +0000 (13:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 7 May 2014 05:28:20 +0000 (13:28 +0800)

Trivial merge