Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 21 Nov 2011 19:18:15 +0000 (14:18 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 21 Nov 2011 19:18:15 +0000 (14:18 -0500)
commit2aedae8118ac09578dddbce0983071df32263b6c
treecde8f190227949d4c3e005ba57f6d71db5d496c6
parentbb610e655fffecee05a3b1bb562dbeeba236e99b
parent25524bf735474ada00a79c88297dccafc8a31a6b
Merge branch 'master' into test
project/dae/templates/dae/postes_liste.html
project/dae/workflow.py