Merge branch 'wip-MDL-32872-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:00:51 +0000 (14:00 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:00:51 +0000 (14:00 +0800)

Trivial merge