Merge branch 'int_behat' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 09:16:29 +0000 (21:16 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 09:16:29 +0000 (21:16 +1200)

Trivial merge