Merge branch 'wip-MDL-40850-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Nov 2013 01:29:44 +0000 (09:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Nov 2013 01:29:44 +0000 (09:29 +0800)

Trivial merge