Merge branch 'master' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 18 Jul 2011 16:40:22 +0000 (12:40 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 18 Jul 2011 16:40:22 +0000 (12:40 -0400)
commita6d7aacb6a1b510aacc740c60a2d56d640003be2
treec80af0880372e69aaf27a430c5c9351c0208887e
parenta87582b74ac250a5232938f3383d514cf6d9304a
parent65fcba3a069eee8941ef8bf5f6247a500c3c1a30
Merge branch 'master' into dev
project/dae/models.py