Merge branch 'MDL-38590_master-fix-behat' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 4 Apr 2013 06:05:17 +0000 (14:05 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Apr 2013 06:05:17 +0000 (14:05 +0800)

Trivial merge