Merge branch 'master' of git.illyse.org:coin

Conflicts:
	coin/billing/admin.py

coin/billing/admin.py

@@ -13,6 +13,7 @@ from coin.filtering_queryset import LimitedAdminInlineMixin
 from coin.billing.models import Invoice, InvoiceDetail, Payment
 from coin.billing.utils import get_invoice_from_id_or_number
 from coin.offers.models import OfferSubscription
+from django.core.urlresolvers import reverse
 import autocomplete_light
 
 
@@ -158,4 +159,5 @@ class InvoiceAdmin(admin.ModelAdmin):
 
         return HttpResponseRedirect(reverse('admin:billing_invoice_change', args=(id,)))
 
+
 admin.site.register(Invoice, InvoiceAdmin)