Merge branch 'wip-MDL-38091-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 03:00:03 +0000 (11:00 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 03:00:03 +0000 (11:00 +0800)

Trivial merge