Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Nov 2013 08:56:20 +0000 (16:56 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Nov 2013 08:56:20 +0000 (16:56 +0800)

Trivial merge