Merge branch 'wip-MDL-41196-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 22 Aug 2013 03:19:55 +0000 (11:19 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 22 Aug 2013 03:19:55 +0000 (11:19 +0800)

Trivial merge