Merge branch 'wip-MDL-37536-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 05:51:58 +0000 (13:51 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 05:51:58 +0000 (13:51 +0800)

Trivial merge