Merge branch 'wip-MDL-40174-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 22 Jul 2013 08:00:41 +0000 (16:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 22 Jul 2013 08:00:41 +0000 (16:00 +0800)

Trivial merge