Merge branch 'wip-MDL-36576-m24' of git://github.com/amygroshek/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 00:56:43 +0000 (08:56 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 00:56:43 +0000 (08:56 +0800)

Trivial merge