Merge branch 'wip-MDL-41369-fix2' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 5 Sep 2013 02:34:11 +0000 (10:34 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 5 Sep 2013 02:34:11 +0000 (10:34 +0800)

Trivial merge