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)
commitd2dae8f050b8eb47428e58bbcc65915af731f555
tree09c637a9489956c9fdf19b86a3ac30f2793e8f52
parentaac98ead572b3094409e91dcb0b0e95be9a7a5b2
parent78af38e432716946d9cee152e5492f995f1e9629
Merge branch 'master' of git.auf.org:auf_django_permissions

Conflicts:
CHANGES
doc/conf.py
setup.py