Merge branch 'wip-MDL-40191-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Dec 2013 03:19:41 +0000 (11:19 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Dec 2013 03:19:41 +0000 (11:19 +0800)

Trivial merge