Noting previous commit from George Ogata.
1.4.14
Merge branch 'v1'

Conflicts:
	HISTORY
	README.textile
	lib/thinking_sphinx/version.rb
2.0.14
Merge remote-tracking branch 'upstream/master'