Merge branch 'wip-MDL-36003-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 03:23:21 +0000 (11:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 03:23:21 +0000 (11:23 +0800)

Trivial merge