Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 8 Sep 2013 22:48:13 +0000 (10:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 8 Sep 2013 22:48:13 +0000 (10:48 +1200)

Trivial merge