Merge branch 'wip-MDL-39526-m25' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 9 May 2013 04:33:32 +0000 (12:33 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 9 May 2013 04:33:32 +0000 (12:33 +0800)

Trivial merge