Merge pull request #559 from michaelmior/django1.5-static

{% static %} template tag for Django 1.5

rest_framework/templatetags/rest_framework.py

@@ -23,7 +23,7 @@ register = template.Library()
 # conflicts with this rest_framework template tag module.
 
 try:  # Django 1.5+
-    from django.contrib.staticfiles.templatetags import StaticFilesNode
+    from django.contrib.staticfiles.templatetags.staticfiles import StaticFilesNode
 
     @register.tag('static')
     def do_static(parser, token):