Merge branch 'wip-MDL-40191-2-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 4 Dec 2013 07:44:03 +0000 (15:44 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Dec 2013 07:44:03 +0000 (15:44 +0800)

Trivial merge