Merge branch 'wip-MDL-32393-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Apr 2012 05:29:04 +0000 (13:29 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Apr 2012 05:29:04 +0000 (13:29 +0800)

Trivial merge