From e8e8c60abc1419531ee243407ebfa512671d838f Mon Sep 17 00:00:00 2001
From: mjumbewu <mjumbewu@gmail.com>
Date: Sat, 8 Sep 2012 16:31:41 -0700
Subject: [PATCH] Updated DjangoCon US 2012 Sprints (markdown)

---
 DjangoCon-US-2012-Sprints.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DjangoCon-US-2012-Sprints.md b/DjangoCon-US-2012-Sprints.md
index 2bc56b7..d976ac4 100644
--- a/DjangoCon-US-2012-Sprints.md
+++ b/DjangoCon-US-2012-Sprints.md
@@ -71,6 +71,8 @@ I think the base ModelResource will probably need to be composed of `APIView` Dj
 
 > Maybe instead it can just be derived from `object`, and act as a mixin itself.  Then, the routers would just construct classes that derive from the appropriate mixins as needed. I'm gonna try that approach out. - @mjumbewu
 
+[Pull request](https://github.com/tomchristie/django-rest-framework/pull/254) - @mjumbewu
+
 ### Test out object-level permissions.
 
 REST framework should now support object level permissions.  (See `SingleObjectBaseView.get_object()` in `generics.py`.)  Using a view with `DjangoModelPermissions`, install `django-guardian` and see if you can get everything playing together nicely.  If so, the Authentication documentation should be updated to reflect that.