Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorDavin Baragiotta <davin.baragiotta@auf.org>
Fri, 1 Jun 2012 21:11:11 +0000 (17:11 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Fri, 1 Jun 2012 21:11:11 +0000 (17:11 -0400)
commit7e8556f8a387184589169262cca4e0a504c333af
tree4960b1288be65d2dd307e37f5ea81ea90cb57fe7
parent30dabdc302a3f74c2d94e663751e97765e7b7502
parent60f34330660a67bcbb558b858d68e0289c907826
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
project/rh/admin.py