Merge branch 'master' of git.auf.org:auf_django_permissions
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 16 Jan 2013 16:56:59 +0000 (11:56 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 16 Jan 2013 16:56:59 +0000 (11:56 -0500)
Conflicts:
CHANGES
doc/conf.py
setup.py


Trivial merge