removed duplicate entry in 2.1.15
deprecate simplejson
Merge pull request #554 from juanriaza/master

Deprecate django.utils.simplejson in favor of Python 2.6's built-in json module
Updated release notes
Added @juanriaza. Thanks
Use the correct static template tag in Django 1.5
Merge pull request #559 from michaelmior/django1.5-static

{% static %} template tag for Django 1.5
Added @michaelmior. Thanks!