[SCM] UNNAMED PROJECT branch, master, updated. 6cbe80a8150209c1b2088bed1c554c2252a9abfa

[Michal Cihar]

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

Really fix phonedb feeds

diff --git a/phonedb/feeds.py b/phonedb/feeds.py
index a918afa..79a63af 100644
--- a/phonedb/feeds.py
+++ b/phonedb/feeds.py
@@ -1,5 +1,5 @@
# -*- coding: UTF-8 -*-
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
from phonedb.models import Vendor, Phone
from django.utils.feedgenerator import Atom1Feed
from django.utils.translation import ugettext as _