Merge branch 'dev' into rh
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 6 Jun 2011 14:01:01 +0000 (10:01 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 6 Jun 2011 14:01:01 +0000 (10:01 -0400)
commit1fabf8b208df951587b3d311449b142dec5ec9a9
tree47dd848f35a8c1ef37aefc429cd7998f2adcce6a
parent15ea717e2cea0beec769050a05bacf6c13a4790e
parentba1059e0f1ab69014559df7082c5b59a874e85f1
Merge branch 'dev' into rh
buildout.cfg
project/rh/models.py
project/settings.py