Merge branch 'master' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 28 Jul 2011 15:39:02 +0000 (11:39 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 28 Jul 2011 15:39:02 +0000 (11:39 -0400)
commit239a909a6311dbb98439dd491c19e753cf9270a5
treefdf34a5be87b35ed92048535b9d6d53178fc47bc
parenta6d7aacb6a1b510aacc740c60a2d56d640003be2
parentdc4b78a73c70f69ea4c6054eb32e0d3abe48cccc
Merge branch 'master' into dev
project/dae/models.py