Merge branch 'wip-MDL-34398-m25-integration' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 02:36:10 +0000 (10:36 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 02:36:10 +0000 (10:36 +0800)

Trivial merge