Merge branch 'dev'
authorEric Mc Sween <eric.mcsween@auf.org>
Thu, 21 Jun 2012 17:58:54 +0000 (13:58 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Thu, 21 Jun 2012 17:58:54 +0000 (13:58 -0400)
commitf019a4c6a0eb2f66e0193d735f7cc46677a92898
tree8b52b5cbfc6eaf3a6b3f45ee621e57e37feb8c34
parenta2bc8581cd9ced85ff940bc10c9f649812ac7277
parent50e2340a98f25fb6c275fccd907a76aed2712350
Merge branch 'dev'

Conflicts:
project/rh/admin.py
project/rh/admin.py