Merge branch 'wip-MDL-37290-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 02:54:51 +0000 (10:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Dec 2012 02:54:51 +0000 (10:54 +0800)

Trivial merge