Merge remote-tracking branch 'upstream/master'

2 files changed, 3 insertions, 3 deletions

diff --git a/examples/objectstore/urls.py b/examples/objectstore/urls.py
index 2c685f59..0a3effa7 100644
--- a/examples/objectstore/urls.py
+++ b/examples/objectstore/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls.defaults import patterns, url
 from objectstore.views import ObjectStoreRoot, StoredObject
- 
+
 urlpatterns = patterns('objectstore.views',
-    url(r'^$', ObjectStoreRoot.as_view(), name='object-store-root'), 
+    url(r'^$', ObjectStoreRoot.as_view(), name='object-store-root'),
     url(r'^(?P<key>[A-Za-z0-9_-]{1,64})/$', StoredObject.as_view(), name='stored-object'),
 )
diff --git a/examples/objectstore/views.py b/examples/objectstore/views.py
index 19999aa9..2a222529 100644
--- a/examples/objectstore/views.py
+++ b/examples/objectstore/views.py
@@ -39,7 +39,7 @@ class ObjectStoreRoot(View):
         ctime_sorted_basenames = [item[0] for item in sorted([(os.path.basename(path), os.path.getctime(path)) for path in filepaths],
                                                              key=operator.itemgetter(1), reverse=True)]
         return [reverse('stored-object', kwargs={'key':key}) for key in ctime_sorted_basenames]
-    
+
     def post(self, request):
         """
         Create a new stored object, with a unique key.