Merge branch 'master' of github.com:sebbacon/alaveteli into asktheeu

Conflicts:
	locale/cy/app.po
	locale/de/app.po
	locale/es/app.po
	locale/fr/app.po
	locale/sq/app.po
	locale/sr/app.po
	locale/sr@latin/app.po

1 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index ffc97237a..4fa603aab 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -63,7 +63,7 @@ class GeneralController < ApplicationController
         end
     end
 
-    # Display WhatDoTheyKnow category from mySociety blog
+    # Display blog entries
     def blog
         medium_cache
         @feed_autodetect = []
@@ -73,7 +73,7 @@ class GeneralController < ApplicationController
             @data = XmlSimple.xml_in(content)
             @channel = @data['channel'][0]
             @blog_items = @channel['item']
-            @feed_autodetect = [ { :url => feed_url, :title => "WhatDoTheyKnow blog"} ]
+            @feed_autodetect = [{:url => feed_url, :title => "#{site_name} blog"}]
         else
             @blog_items = []
         end