Merge branch 'wip-MDL-33985-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 05:00:33 +0000 (13:00 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 05:00:33 +0000 (13:00 +0800)

Trivial merge