Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 26 Aug 2013 01:43:06 +0000 (09:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 26 Aug 2013 01:43:06 +0000 (09:43 +0800)

Trivial merge