Moved hard-coded fetch timeout values into config file to allow site-level tuning
typos: "interval" has a value, option->options
remove ru_RU translation: unmaintained, broken
Merge pull request #113 from sash-kan/patch-1

typos: "interval" has a value, option->options
Merge branch 'master' into tunable-fetches

Conflicts:
	include/rssfuncs.php
add HOOK_TOOLBAR_BUTTON, HOOK_ACTION_ITEM, HOOK_HEADLINE_TOOLBAR_BUTTON
tweak ttrssZoom display
validate_session: check for user agent
remove obsolete xml stuff in pref-users infoboxes
add missing gettext libs
Merge branch 'master' of https://github.com/stickystyle/Tiny-Tiny-RSS
Merge pull request #115 from stickystyle/master

require_once for gettext in sessions.php missing
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Revert "remove ru_RU translation: unmaintained, broken"

This reverts commit c2647e294cc67a3dc6f25b22084e6198e6656a1e.
fix broken header of ru_RU translation thanks to Tomáš Chvátal; rebase translations
Move tuning settings to different file so config.php isn't overcrowded
by default
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git into tunable-fetches
Merge branch 'master' into tunable-fetches
update.php --daemon did not respect --quiet
daemon2: make wrong schema version error display if quiet