Merge branch 'MDL-41568_master-fix_behat' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 4 Sep 2013 08:59:20 +0000 (16:59 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Sep 2013 08:59:20 +0000 (16:59 +0800)

Trivial merge