fix conflict
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Wed, 25 May 2011 14:00:25 +0000 (10:00 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Wed, 25 May 2011 14:00:25 +0000 (10:00 -0400)
commit25e6cfc8437974e1fae9b05b53820bb45b64e93f
tree583d80d82c401197a143bbcfa450705027b19476
parent676669276b46617e1470a0253355ffc2a7bd10aa
parent3420143c55e405a316ea33c170a9305e49e39d54
fix conflict
project/rh/admin.py
project/rh/models.py