From b3d20ade47aadce5bd02ff33ea7dc0e19cf004cb Mon Sep 17 00:00:00 2001
From: Joseph Kocherhans <joseph@jkocherhans.com>
Date: Mon, 22 Feb 2010 23:38:18 +0000
Subject: Fixed #12820. Implemented other dict methods for MergeDict. Thanks,
 Gisle Aas.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index 119bb8b20a..92b1559042 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
 people who have submitted patches, reported bugs, added translations, helped
 answer newbie questions, and generally made Django that much better:
 
+    Gisle Aas <gisle@aas.no>
     ajs <adi@sieker.info>
     alang@bright-green.com
     Alcides Fonseca
-- 
cgit v1.3