Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 19:36:39 +0000 (08:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 19:36:39 +0000 (08:36 +1300)
commite3f7ac09e7cd6e2be6a498bcdf31aa82b713466f
tree06663aa2bfe1cd8b7a23556b09a35e6ada1c3942
parentd073a5f11873746cd849401b486ad54198e83741
parentddb0a1b0e551157a6ec03a81b7643af93b47779a
Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle

Conflicts:
config-dist.php
config-dist.php
lib/behat/classes/behat_config_manager.php