Merge branch 'MDL-46188' of https://github.com/shashirepo/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Aug 2014 05:13:08 +0000 (13:13 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Aug 2014 05:13:08 +0000 (13:13 +0800)

Trivial merge