Allow setting sql_query_pre in config.
Merge branch 'v1'
Noting previous commit from George Ogata.
Fix ThinkingSphinx::Context#load_models to work again with Rails 3.2.9 in case subdirectories exist.
It's probably safer to be on the explicit side.
1.4.14
Merge branch 'v1'

Conflicts:
	HISTORY
	README.textile
	lib/thinking_sphinx/version.rb
2.0.14
Fix year from 2012 to 2013 in HISTORY

Correct the year on the 2.0.14 release.
Merge pull request #424 from tjh/patch-1

Fix year from 2012 to 2013 in HISTORY
First pass at connection pool support via Riddle/Sphinx.
Merge branch 'v1' into v2

Conflicts:
	lib/thinking_sphinx.rb
	lib/thinking_sphinx/configuration.rb
	lib/thinking_sphinx/search.rb
	thinking-sphinx.gemspec
Specs now refer to connection pool instead of configuration.
Merge branch 'v1' into v2
Avoid endless loops.
Avoid same methods on both client and outer connection.
Merge branch 'v1' into v2
Support new JDBC configuration style.
Merge branch 'v1' into v2
removed named capture to be compatible with Ruby 1.8