Merge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Sep 2014 15:13:20 +0000 (16:13 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Sep 2014 15:13:20 +0000 (16:13 +0100)

Trivial merge