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()
Merge pull request #144 from lotrfan/import_export_fix

[import_export plugin] Escape ']]>' (closing CDATA tag) when exporting feeds
Merge remote-tracking branch 'upstream/master'
Meger with upstream
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
updated german translation
Merge pull request #145 from HeikoAdams/master

German translation updated
mailto: use rawurlencode
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Use CSS3 ellipsis in .postTitle.

CSS3 property which makes cut-off text look smoother.
Merge pull request #146 from pictuga/patch-1

Use CSS3 ellipsis in .postTitle.
implement upload-related support for open_basedir
Add new API method: `getFeedStats'

`getFeedStats' calls the new static function `api_get_feed_stats' to
return an array of real feeds of the following form:

    [{
       "first" : 1127,
       "unread" : 873,
       "last" : 15460,
       "title" : "Some feed",
       "id" : 31,
       "total" : 1513
    }]

where "first", "last", "total" are the first, last and total number of
articles in the feed.

This adds the ability to nntp-oriented clients to efficiently retrieve
an "active file" without having to resort to `getHeadlines(limit=-1)'
Merge pull request #147 from pedros/nnttrss_api_extensions

Add new API method: `getFeedStats`
bump api level
fix import_export plugin for open_basedir; add missing closing form tags to import_export and googleimport plugin
backend: add session validation check
add feed-icons placeholder index.html