Merge branch 'MDL-53758-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Apr 2016 18:34:20 +0000 (20:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Apr 2016 18:34:20 +0000 (20:34 +0200)
commit33952d4a536c06df659260e86abb1ef8c372ecd0
tree51ed802fed228b710905ade55c4337b2c76ac21e
parent667589d05f43e9398f4d1809fb441576dc780824
parent053118a1841d8cf8d75671f9a47a03104eacf9cf
Merge branch 'MDL-53758-master' of git://github.com/merrill-oakland/moodle
search/classes/engine.php
search/classes/manager.php
search/engine/solr/classes/engine.php
search/engine/solr/tests/engine_test.php
search/index.php