Merge branch 'master' into dev
authorOlivier Larchevêque <olivier.larcheveque@gmail.com>
Thu, 18 Aug 2011 21:56:40 +0000 (17:56 -0400)
committerOlivier Larchevêque <olivier.larcheveque@gmail.com>
Thu, 18 Aug 2011 21:56:40 +0000 (17:56 -0400)
1  2 
project/dae/models.py

Simple merge