Merge branch 'MDL-44773-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 02:08:28 +0000 (10:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 02:08:28 +0000 (10:08 +0800)

Trivial merge