Merge branch 'MDL-41587_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:52:52 +0000 (08:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:52:52 +0000 (08:52 +1200)
1  2 
lib/behat/classes/util.php
lib/tests/behat/behat_hooks.php

Simple merge
Simple merge