Merge pull request #429 from reduxionist/PR412-resubmit

Thanks again for the contribution @mrkiwi-nz, and my apologies for accidentally closing the original PR!

helpdesk/urls.py

@@ -10,9 +10,9 @@ urls.py - Mapping of URL's to our various views. Note we always used NAMED
 from django.conf import settings
 import django
 if django.get_version().startswith("1.3"):
-	from django.conf.urls.defaults import *
+    from django.conf.urls.defaults import *
 else:
-	from django.conf.urls import *
+    from django.conf.urls import *
 from django.contrib.auth.decorators import login_required
 
 from helpdesk import settings as helpdesk_settings

helpdesk/views/staff.py

@@ -862,7 +862,7 @@ def ticket_list(request):
     try:
         page = int(request.GET.get('page', '1'))
     except ValueError:
-         page = 1
+        page = 1
 
     try:
         tickets = ticket_paginator.page(page)