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)
1  2 
project/rh/admin.py

Simple merge