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

Trivial merge