Merge branch 'MDL-53412-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 00:57:22 +0000 (08:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 00:57:22 +0000 (08:57 +0800)
commitef67e6c5f8c2f1d3678f42d530e3f75fd763badf
treed2ed2052dc4733c045c8e287a521b403d4a5c144
parent7960ad0571662f8964137744cfe09e9d2290c787
parent5dc4624ced469adb6103049ca82341cf6f4990a7
Merge branch 'MDL-53412-master' of git://github.com/merrill-oakland/moodle
search/engine/solr/classes/engine.php
search/engine/solr/tests/engine_test.php