Merge branch 'MDL-54926-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 15:54:40 +0000 (16:54 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 15:54:40 +0000 (16:54 +0100)
commitb76edf3cfa81444c4b36d73b412acbf94f5c46ba
tree8d83b1cda13ed705c8cb1fceaa4411af4e546e12
parentcf7dc57a91d423e5896eb52084241b483d27a990
parent4e2b5191d47ab853f25c3371bbb7e3794755a939
Merge branch 'MDL-54926-master' of git://github.com/merrill-oakland/moodle
search/classes/document.php
search/tests/fixtures/mock_search_area.php