Merge branch 'MDL-39441_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 02:45:42 +0000 (10:45 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 02:45:42 +0000 (10:45 +0800)
commit51425cc045664b71fbaeb21b2ed75535c98b5fee
treee82a74cac4fe38f4fab9ac2dbc3817b1f4f68daf
parent7bdae0924f6903e763a3d2eb54802b44eec12659
parent401f60d576e91d5ad9441b0a72a52f234b326ce6
Merge branch 'MDL-39441_master' of git://github.com/dmonllao/moodle
admin/tool/behat/cli/util.php
lib/setup.php