Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Fri, 8 Apr 2011 15:43:53 +0000 (11:43 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Fri, 8 Apr 2011 15:43:53 +0000 (11:43 -0400)
commite1c17604e0d4f0b9196e4f9b991d6ef0eea276a3
treea3f4cc995636be39c9125f33b5208e8c78eb0bbd
parent4d25e2baa3b7de62b7b1c9d47dbc2e46084b611e
parentad86bbb373705da3b5dde83acb441b736292ae2f
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
project/dae/models.py