Merge branch 'wip-MDL-41057-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 21 Aug 2013 06:05:13 +0000 (14:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 21 Aug 2013 06:05:13 +0000 (14:05 +0800)

Trivial merge