Merge branch 'wip-MDL-32264-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Apr 2012 02:17:35 +0000 (10:17 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Apr 2012 02:17:35 +0000 (10:17 +0800)

Trivial merge