Merge branch 'development' of github.com:LPgenerator/django-db-mailer…

… into development

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+Before to submit your pull-request:
+
+- Be sure that the unit tests pass
+- If you create a new feature, test your code, do not introduce new bugs
+- Avoid code duplication
+- Small pull-requests are easier to review and can be merged quickly
+- 1 pull-request == 1 feature/improvement

AUTHORS.rst

@@ -18,3 +18,4 @@ Contributors
 * Sergey Khaylov (`skhaylov <https://github.com/skhaylov>`_)
 * Ilya Streltsov (`ilstreltsov <https://github.com/ilstreltsov>`_)
 * Antoine Nguyen  (`tonioo <https://github.com/tonioo>`_)
+* Tomáš Peterka (`katomaso <https://github.com/katomaso>`_)

dbmail/admin.py

@@ -6,7 +6,7 @@
 from django.utils.translation import ugettext_lazy as _
 from django.shortcuts import redirect, render
 from django.core.urlresolvers import reverse
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.contrib import messages
 from django.contrib import admin