Merge branch 'dev' of git.auf.org:auf_rh_dae into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Fri, 1 Jun 2012 20:17:18 +0000 (16:17 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Fri, 1 Jun 2012 20:17:18 +0000 (16:17 -0400)
commit6e55599a5e28f7f9e4eb44ebe5b696b240862b0b
tree727d18d547b493e8b3df9119b030764ef8a6b517
parent08a9b6fcb294479aea587abf57c7ab3bfec5def7
parent7503fc1ca5675c18b2bd05ad14e92f3d651963fc
Merge branch 'dev' of git.auf.org:auf_rh_dae into dev
project/rh/admin.py