merge rh et dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 6 May 2011 19:49:55 +0000 (15:49 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 6 May 2011 19:49:55 +0000 (15:49 -0400)
commitc589d980e2df0cdf3f58db691d5feffb509f4dbd
treee8ba23c1e75421179b7064d00d5bd995c6444d2b
parent50fa9bc168a99ede5612e007258053fd4935992d
parent05855464de56ec46b828210e4932f1a50983a82c
merge rh et dev
project/dae/models.py
project/rh/models.py
project/rh_v1/models.py
project/settings.py