Fixed #2620: made MergeDict.get() correctly work with the two-argument form of get(). Thanks for the patch, SmileyChris.
Fixed #2620: made MergeDict.get() correctly work with the two-argument form of get(). Thanks for the patch, SmileyChris.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4576 bcc190cf-cafb-0310-a4f2-bffc1f526a37

--HG--
extra : convert_revision : f49cf1b4d58386823744c770f5c28bf05c39fe29

adieu/django-nonrel,heracek/django-nonrel,heracek/django-nonrel,heracek/django-nonrel,adieu/django-nonrel,adieu/django-nonrel