Merge remote branch 'origin/dev' into dae
authorNicolas Cadou <ncadou@cadou.ca>
Sun, 3 Apr 2011 16:40:15 +0000 (12:40 -0400)
committerNicolas Cadou <ncadou@cadou.ca>
Sun, 3 Apr 2011 16:40:15 +0000 (12:40 -0400)
commit91777b25ce4ba0a4c2b8c112ccc5da452dbec43b
treebfb9e1e5a8e29cd9dd1069d4354cfc59d236d2bc
parent494ff2be7c36ce28f6e2aa2ad2105bbeaeea1fde
parent076ecc3aebb263df25e0f03ab35cfccd7cb2ef3f
Merge remote branch 'origin/dev' into dae
project/dae/models.py