[SCM] UNNAMED PROJECT branch, master, updated. ee33830f06a06a2b4a06dccf26614e393e983551

[Michal Cihar]

The following commit has been merged in the master branch:
commit 5ab3d54cff7cf1463f28c02b6002eeb7fe14ae7c
Author: Michal Čihař <***@cihar.com>
Date: Mon Apr 2 10:41:47 2012 +0200

Fix import for feed

diff --git a/news/feeds.py b/news/feeds.py
index 9faaf6d..97bfb1c 100644
--- a/news/feeds.py
+++ b/news/feeds.py
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
from news.models import Entry, Category
from django.utils.feedgenerator import Atom1Feed
from django.utils.translation import ugettext as _

[Michal Cihar]

The following commit has been merged in the master branch:
commit ee33830f06a06a2b4a06dccf26614e393e983551
Author: Michal Čihař <***@cihar.com>
Date: Mon Apr 2 10:42:20 2012 +0200

Update year

diff --git a/news/feeds.py b/news/feeds.py
index 97bfb1c..9879e2b 100644
--- a/news/feeds.py
+++ b/news/feeds.py
@@ -9,7 +9,7 @@ class RssNewsFeed(Feed):
title = _('Wammu and Gammu News')
link = '/news/'
description = _('Updates about Wammu and Gammu programs.')
- copyright = 'Copyright © 2003 - 2009 Michal Čihař'
+ copyright = 'Copyright © 2003 - 2012 Michal Čihař'
item_copyright = copyright
title_template ='feeds/news_title.html'
description_template = 'feeds/news_description.html'