Merge tag 'release_2012-01-11'

Pkgbase view in todos, other changes related to caching

Conflicts:
	public/views.py

1 files changed, 4 insertions, 4 deletions

diff --git a/urls.py b/urls.py
index 64931968..b4175391 100644
--- a/urls.py
+++ b/urls.py
@@ -27,12 +27,12 @@ urlpatterns = []
 # Feeds patterns, used later
 feeds_patterns = patterns('',
     (r'^$',          'public.views.feeds', {}, 'feeds-list'),
-    (r'^news/$',     NewsFeed()),
-    (r'^packages/$', PackageFeed()),
+    (r'^news/$',     cache_page(300)(NewsFeed())),
+    (r'^packages/$', cache_page(300)(PackageFeed())),
     (r'^packages/(?P<arch>[A-z0-9]+)/$',
-        PackageFeed()),
+        cache_page(300)(PackageFeed())),
     (r'^packages/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$',
-        PackageFeed()),
+        cache_page(300)(PackageFeed())),
 )
 
 # Sitemaps