Merge branch 'wip-MDL-37683-m25' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Feb 2013 01:30:47 +0000 (09:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Feb 2013 01:30:47 +0000 (09:30 +0800)

Trivial merge