Merge branch 'wip-MDL-32611-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 05:12:53 +0000 (13:12 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 05:12:53 +0000 (13:12 +0800)

Trivial merge