Merge remote-tracking branch 'upstream/master'

diff --cc index.php
Simple merge

diff --cc js/tt-rss.js
index c80e8737db8fb5cb54665cf46ef15373f04a31c9,eaa1f3daf30852b3f913afb12e7eb6b1dbbb8363..1d6540dbb47e90c8b6a94551cda23d9e49bbf7e2
--- 1/js/tt-rss.js
--- 2/js/tt-rss.js
+++ b/js/tt-rss.js
@@@ -178,14 -178,10 +178,14 @@@ function search() 
  }
  
  function updateTitle() {
 -      var tmp = "Tiny Tiny RSS";
 +      var tmp = document.title; 
 +    if (tmp.indexOf('(')>0)
 +    {
 +       tmp = tmp.substr(0,tmp.lastIndexOf('('));
 +    }
  
        if (global_unread > 0) {
-               tmp = tmp + " (" + global_unread + ")";
+               tmp = "(" + global_unread + ") " + tmp;
        }
  
        if (window.fluid) {

diff --cc prefs.php
Simple merge