Merge branch 'wip-MDL-38000-m25' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Feb 2013 05:48:12 +0000 (13:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Feb 2013 05:48:12 +0000 (13:48 +0800)

Trivial merge