merge upstream

This commit is contained in:
Toon Claes 2012-08-02 11:27:10 +02:00
commit d3db100dbd
53 changed files with 292 additions and 704 deletions

View file

@ -220,4 +220,3 @@ _managepy() {
compdef _managepy manage.py
compdef _managepy django
compdef _managepy django-manage