admin.py modified
Merge remote-tracking branch 'upstream/dirty' into dirty

admin.py modified
Merge pull request #170 from aashitadutta/dirty

Admin.py modified