Merge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 06:58:31 +0000 (14:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 06:58:31 +0000 (14:58 +0800)

Trivial merge