Merge branch 'wip-MDL-37935-m25' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 05:05:57 +0000 (13:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 05:05:57 +0000 (13:05 +0800)

Trivial merge