do not rely on feed_id when adding archived feed while unsubscribing
embed_original: change overflow for the iframe content from hidden to auto
Without this change only a portion of the original website is embedded
in Firefox 20. The Chromium 26 behavior is as expected with hidden and auto.
Merge pull request #141 from tptb/master

embed_original: change overflow for the iframe content from hidden to auto
implement support for multiple pub/mark buttons, add plugin which adds a separate mark button to article botton in combined mode (closes #382)
mark_button: fix missing id
search_to_sql: fix searching for reserved keywords
add HOOK_ARTICLE_LEFT_BUTTON
update description of DEFAULT_UPDATE_INTERVAL
rebase translations
update default of allow_duplicate_posts to false, bump schema
update description of DEFAULT_UPDATE_INTERVAL (2)
rebase translations
Added propagation of $fetch_last_content_type for curl- and file_get_contents-calls
Merge pull request #143 from mbirth/master

Return Content-Type with fetch_file_contents()
Escape ']]>' (closing CDATA tag) when exporting with import_export plugin
Merge pull request #144 from lotrfan/import_export_fix

[import_export plugin] Escape ']]>' (closing CDATA tag) when exporting feeds
pre: forbid layout breaking width
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Revert "Revert "another attempt to workaround against feedtree scroll issues""

This reverts commit 9b176694f5ce928ac76984a3b1518353aa9cad5a.

Conflicts:
	tt-rss.css
initial