Merge branch 'wip-MDL-41395-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 4 Sep 2013 02:33:33 +0000 (10:33 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Sep 2013 02:33:33 +0000 (10:33 +0800)

Trivial merge