Merge remote branch 'origin/dev' into dae
authorNicolas Cadou <ncadou@cadou.ca>
Fri, 8 Apr 2011 04:55:55 +0000 (00:55 -0400)
committerNicolas Cadou <ncadou@cadou.ca>
Fri, 8 Apr 2011 04:55:55 +0000 (00:55 -0400)
commit0801327cc1724f5e7dcdb41647b8ee9c61d8ccf4
tree0c1ebbea3e6c56aeeb9537f0cee72b37d82c36eb
parentcb1d62b5f46534f13aa0af4010557dd5d974d954
parentb9d81e901d3aa87c8f3496ffe6aefc6db325f566
Merge remote branch 'origin/dev' into dae

Conflicts:
project/dae/templates/dae/embauche.html
project/dae/models.py
project/dae/templates/dae/embauche.html
project/dae/views.py
project/rh_v1/models.py