Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 21:48:42 +0000 (23:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 21:48:42 +0000 (23:48 +0200)

Trivial merge