Merge branch 'wip-MDL-39526-m25-p2' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 03:59:29 +0000 (11:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 03:59:29 +0000 (11:59 +0800)

Trivial merge