Merge branch 'wip-MDL-31414-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 May 2012 02:39:16 +0000 (10:39 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 May 2012 02:39:16 +0000 (10:39 +0800)

Trivial merge