Merge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 04:22:39 +0000 (12:22 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 04:22:39 +0000 (12:22 +0800)

Trivial merge