Merge branch 'MDL-42385_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Nov 2013 04:34:35 +0000 (12:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Nov 2013 04:34:35 +0000 (12:34 +0800)
1  2 
admin/tests/behat/behat_admin.php
course/tests/behat/behat_course.php

Simple merge
Simple merge