Merge branch 'wip-MDL-44321-master-fix2' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 03:08:31 +0000 (11:08 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 03:08:31 +0000 (11:08 +0800)

Trivial merge