Merge branch 'wip-MDL-25928-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 04:05:05 +0000 (12:05 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 04:05:05 +0000 (12:05 +0800)

Trivial merge