Merge branch 'wip-MDL-36939-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 03:08:42 +0000 (11:08 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 03:08:42 +0000 (11:08 +0800)

Trivial merge