Fix password field missing on login form when auth_internal not used
Merge pull request #193 from kwirk/login_form_fix

Fix password field missing on login form when auth_internal not used
when checking filter expression for validity, do not include ttrss_feed_categories (closes #689)
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
document the date format string

I assumed the format string was related to strftime except all of the
fields looked really weird.  After digging in the code, this string is
actually used with php's date().  Add a note for this so other people
can jump quickly to the relevant documentation (which is useful for
non-php peeps who have no idea what this is).
Merge pull request #194 from vapier/master

document the date preference format string
adjust previous patch phrasing a bit
googlereaderkeys: add o/enter/? keys like Google Reader
Merge pull request #195 from vapier/master

more Google Reader keys
Revert "remove floicon because its author is a colossal shitlord (http://tt-rss.org/forum/viewtopic.php?f=1&t=2055&p=10824#p10822)"

This reverts commit dce5037888968788518dfdb6b1c29f3863238b92.
add a placeholder where floicon might be added if needed, still keep it
off trunk re: author being a shitlord
move stylesheets to css/, reference default tt-rss stylesheets from
default.css to make custom themes easier
add floicon to gitignore
update path to utility.css
Merge pull request #196 from levito/patch-1

update path to utility.css
daemon2: only perform houskeeping on task 0
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
parser/rss: try to get link from guid isPermaLink=true
update_rss_feed: remove unused override_url parameter
add HOOK_FETCH_FEED