Merge branch 'wip-MDL-33987-m23' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 07:08:12 +0000 (15:08 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 07:08:12 +0000 (15:08 +0800)

Trivial merge