Merge branch 'MDL-53325-master' of git://github.com/merrill-oakland/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 02:06:47 +0000 (10:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 02:06:47 +0000 (10:06 +0800)
commitbd2e5ef17dcdb480223d3c1bc91fe828761f9c3d
treec43ce3bf1d1749ee5ca99348d1c1a1302f363b2a
parent020d27a7333550257fab3270ed4817f84110440c
parent075fa912718cc2e4f8255ffe2d88bc9d65f9e559
Merge branch 'MDL-53325-master' of git://github.com/merrill-oakland/moodle
search/classes/manager.php
search/engine/solr/classes/engine.php