Merge branch 'wip-MDL-33597-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 07:45:19 +0000 (15:45 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 07:45:19 +0000 (15:45 +0800)

Trivial merge