Merge branch 'wip-MDL-42323-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 04:33:15 +0000 (12:33 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 04:33:15 +0000 (12:33 +0800)

Trivial merge