Merge pull request #901 from giamfreeg/master

Fixed an erroneous import in example code of docs (class-based-views/intro).

docs/topics/class-based-views/intro.txt

@@ -71,7 +71,7 @@ something like::
 In a class-based view, this would become::
 
     from django.http import HttpResponse
-    from django.views.base import View
+    from django.views.generic.base import View
 
     class MyView(View):
         def get(self, request):
@@ -113,7 +113,7 @@ and methods in the subclass. So that if your parent class had an attribute
 ``greeting`` like this::
 
     from django.http import HttpResponse
-    from django.views.base import View
+    from django.views.generic.base import View
 
     class GreetingView(View):
         greeting = "Good Day"