Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 05:51:07 +0000 (13:51 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 05:51:07 +0000 (13:51 +0800)

Trivial merge