Merge branch 'MDL-55082-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 14:20:48 +0000 (15:20 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 14:20:48 +0000 (15:20 +0100)
commit64ec975e19e3792d3802a2d060895e45cef801b2
tree4511e67c2ac4afd22d64f9bcf3aad92d44c6706b
parent26140adbb9d86d8d171c6877fad13683de80696e
parent55b62370aa8777c8a43de2a42d47e986be656654
Merge branch 'MDL-55082-master' of git://github.com/merrill-oakland/moodle
search/tests/fixtures/mock_search_area.php