Merge branch 'test' into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Fri, 18 Nov 2011 17:29:43 +0000 (12:29 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Fri, 18 Nov 2011 17:29:43 +0000 (12:29 -0500)
commit6b129ee26e41d0c3f7fe046fa1bd256e59f03381
tree8c1f7ded57c624eef787c9f56dabeb1f027262ec
parentef0eb8a055fc3f280816a8ce6346b4021491d857
parent02b68f0ed3b855adc02844e1674dbc796e53f305
Merge branch 'test' into dev

Conflicts:
project/dae/models.py
project/dae/models.py