Merge branch 'wip-MDL-38701-m25' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 02:22:59 +0000 (10:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 02:22:59 +0000 (10:22 +0800)

Trivial merge