Change default SELF_URL_PATH for RFC 2602
Merge pull request #265 from frh/master

Change default SELF_URL_PATH for RFC 2602
Merge pull request #264 from yak1ex/pr_ja_JP

ja_JP translation
properly escape feed error message in headlines toolbar
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Merge pull request #263 from yak1ex/messages_in_plural_form_in_js

Create message table entries for plural forms and lookup them in JS.
Try to use larger GoComics image
Revert "add temporary hack to store original unhashed guid into cached_content for debugging"

This reverts commit 8096e309a5138d47af0314059fdca59f17c42659.
fix filter content previews showing html content
do not include sphinxclient if the class already exists
Revert "do not include sphinxclient if the class already exists"

This reverts commit 63edc5c6315ca75305d497987e2d33385d6d30d6.
add a sanity check for system sphinx client which conflicts with the bundled one
fix typo in config.php-dist
config.php-dist: fix lines which were too long
Feedparser/encoding change: More general regular expression, set encoding to UTF-8 explicitly
remove dijit checkbox element from floatingTitle
Merge pull request #267 from wltb/master

Feedparser constructor/encoding change
hide collapse sidebar button by default
fix counternode going behind feed title on gecko
add experimental hack to show row unread status in floating title