Merge branch 'wip-MDL-36381-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 01:33:43 +0000 (09:33 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 01:33:43 +0000 (09:33 +0800)

Trivial merge