Merge branch 'wip-MDL-47919-master2' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 08:30:43 +0000 (08:30 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 08:30:43 +0000 (08:30 +0000)

Trivial merge