Merge branch 'wip-MDL-41127-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 07:55:14 +0000 (15:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 07:55:14 +0000 (15:55 +0800)

Trivial merge