Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 08:21:21 +0000 (16:21 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 08:21:21 +0000 (16:21 +0800)
1  2 
cohort/tests/behat/behat_cohort.php

Simple merge