Merge branch 'wip-MDL-47919-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 12:42:55 +0000 (12:42 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 12:42:55 +0000 (12:42 +0000)

Trivial merge