Feature #446 - Allow customizing page title
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix merge conflict with stylesheet tags
add some japanese trancerations.
Update message.po's header
i mistake date
update japanese translation
Merge branch 'master' of github.com:skikuta/Tiny-Tiny-RSS

Conflicts:
	locale/ja_JP/LC_MESSAGES/messages.po
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add headline menu entry to show article url
update translations
Merge remote-tracking branch 'upstream/master'
remove long deprecated mobile/
Merge pull request #67 from Joschasa/master

Fix feed title display in "normal" (not combined) mode