Merge branch 'wip-MDL-36937-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 30 Nov 2012 01:48:36 +0000 (09:48 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 30 Nov 2012 01:48:36 +0000 (09:48 +0800)

Trivial merge