Merge branch 'wip-MDL-44340-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 8 Apr 2014 04:16:42 +0000 (12:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 8 Apr 2014 04:16:42 +0000 (12:16 +0800)

Trivial merge