Noting previous commit from George Ogata.
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