Merge branch 'MDL-46812-master-fixup' of https://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 27 Aug 2014 02:48:36 +0000 (10:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 27 Aug 2014 02:48:36 +0000 (10:48 +0800)

Trivial merge