Merge branch 'MDL-53271-master' of git://github.com/merrill-oakland/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 03:05:44 +0000 (11:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 03:05:44 +0000 (11:05 +0800)
1  2 
search/engine/solr/classes/engine.php

Simple merge