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)
commit5286ab021b0789cd67cf7ee8c941dacd15efe6a1
tree0c47057b21ce5b80998ecb488a47d020285697de
parent3cfd0e409cebdf45620f0c1fcd315cee618e0b75
parentae5c920b03a7ce1be3ced157f56ced0ebc211452
Merge branch 'master' into dev
project/dae/models.py