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
add <source><title> to feed rss output
add <source><title> to feed rss output
getting last_marked value from starred.json
prevent accidental ctrl_key global
Added alt and meta key handling to hotkeys
Update feedparser.php
Update atom.php
Filter test from web interface now replicates behaviour from pull #167
Merge pull request #249 from qwerdy/master

Filter test from web interface now replicates behaviour from pull #167
Merge pull request #247 from TheSpyder/hotkey_fixes

Hotkey fixes
Merge pull request #246 from KestL/master

Google Reader Import plugin - right datetime in last_marked
Merge pull request #245 from shibuya246/master

add <source><title> to feed rss output as is common in other rss feeds