Merge branch 'wip-MDL-36066-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Nov 2012 03:42:35 +0000 (11:42 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Nov 2012 03:42:35 +0000 (11:42 +0800)

Trivial merge