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 commit 'f97045d'
Remove java conditions

Signed-off-by: yury.kaliada <fut.wrk@gmail.com>
Merge pull request #1 from FUT/master

Remove java conditions