Merge remote branch 'origin/dev' into dae
authorNicolas Cadou <ncadou@cadou.ca>
Tue, 5 Apr 2011 23:19:16 +0000 (19:19 -0400)
committerNicolas Cadou <ncadou@cadou.ca>
Tue, 5 Apr 2011 23:19:16 +0000 (19:19 -0400)
commit7ad7408eec39e3626abcd128942685b71b7630e0
tree777fc5d7469484f37af207235834168eb992c0fd
parent139686f200ee485d2fce21a9afe5725895d76c02
parent9a85768a3216c2d1d43aee6d1a669a8b327a79f0
Merge remote branch 'origin/dev' into dae

Conflicts:
project/dae/models.py
project/dae/urls.py
project/templates/menu.html
project/dae/forms.py
project/dae/models.py
project/dae/urls.py
project/dae/views.py
project/rh_v1/models.py
project/templates/menu.html