Merge branch 'wip-MDL-23044-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 07:33:25 +0000 (15:33 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 07:33:25 +0000 (15:33 +0800)

Trivial merge