Merge branch 'wip-MDL-36379-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 01:47:56 +0000 (09:47 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 01:47:56 +0000 (09:47 +0800)

Trivial merge