Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Fri, 18 Nov 2011 17:27:49 +0000 (12:27 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Fri, 18 Nov 2011 17:27:49 +0000 (12:27 -0500)
commit02b68f0ed3b855adc02844e1674dbc796e53f305
tree5d6e673d6aeb8bca21133d6edfda388053b4a44b
parent203f5820d3f8025df158eb92a846dbb5f7cd1019
parent1817001707dba888da8892b87474e1cf65defe35
Merge branch 'master' into test
project/dae/models.py
project/dae/templates/dae/poste.html