Merge branch 'hotfix' into olivier
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 20 Mar 2012 19:55:57 +0000 (15:55 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 20 Mar 2012 19:55:57 +0000 (15:55 -0400)
commit89f07bff202529338851d4fb1b075d5059f3135a
treea4e3dec29fa6a753e00c7ffe8d31c9e08970e92a
parent3b14230daba5ecd5edc0e605165fb18d11e3329f
parentb77f1d676b0f16c44ef517c25bee749806f9c848
Merge branch 'hotfix' into olivier
project/dae/models.py
project/rh/models.py