Changes to add a new hook:  HOOK_QUERY_HEADLINES.  An example is provided.
Merge remote-tracking branch 'origin' into hookhead

Conflicts:
	classes/feeds.php

fix for merging up to the origin
change for HOOK_QUERY_HEADLINES.  See example for details.
one more change to merge to origin
Changed the implementation of HOOK_QUERY_HEADLINES to deal with issue Fox raised
Add some explanaiton in the example about the content_preview field
fixed a typo
Merge remote-tracking branch 'origin' into hookhead

update to latest
changes to add hook_query_headlines
Merge branch 'master' of http://github.com/gothfox/Tiny-Tiny-RSS

updating from github]
Merge branch 'master' into hookhead

Conflicts:
	include/functions.php

changes for conflicts with master
forgot one file
Merge branch 'hookhead' of git://github.com/justauserx/Tiny-Tiny-RSS into justauserx-hookhead
api: fix typo
remove query_headlines example plugin
move reassigning content_preview after hook to a more sensible place
remove unused cached_content
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS