Merge branch 'MDL-46036_survey' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 14:58:11 +0000 (15:58 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 14:58:11 +0000 (15:58 +0100)

Trivial merge