Merge branch 'dev' of git.auf.org:auf_rh_dae into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Tue, 31 Jan 2012 21:53:57 +0000 (16:53 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Tue, 31 Jan 2012 21:53:57 +0000 (16:53 -0500)
commit0005716b647970191e00b306e0da48e5635a6fa5
tree5c21799bb2f3244289bc385b5f604188aaa4cd8e
parentb15a6addca95afe6375910a85c75c3991333a0aa
parent0ce4c68b6842382c2f6817a31f3d5976de8fa2b8
Merge branch 'dev' of git.auf.org:auf_rh_dae into dev
project/rh/models.py