Merge branch 'MDL-44257-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Sep 2014 06:58:48 +0000 (14:58 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Sep 2014 06:58:48 +0000 (14:58 +0800)

Trivial merge