Test cases: handle removal of AdminMediaHandler in Django 1.5
Handle removal of WSGIServerException in Django 1.6
Merge branch '_testcases_admin_media'
Resolved merge conflict
Merge branch 'master' of github.com:mkai/django-devserver