Merge branch 'wip-MDL-40353-m23' of git://github.com/marinaglancy/moodle into MOODLE_...
authorDamyon Wiese <damyon@moodle.com>
Tue, 2 Jul 2013 06:29:46 +0000 (14:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 2 Jul 2013 06:29:46 +0000 (14:29 +0800)

Trivial merge