Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Jul 2016 10:57:09 +0000 (11:57 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Jul 2016 10:57:09 +0000 (11:57 +0100)
1  2 
search/classes/manager.php

Simple merge