merge branche dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 31 May 2011 13:03:57 +0000 (09:03 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 31 May 2011 13:03:57 +0000 (09:03 -0400)
commite9d7483c2d1a507d4c8ee33e837b9b2a599700f0
tree24ff21206d1696f67d2bf52af45b16458e999625
parentf31ddfa0de7cbd84b120b837fc7de3be7ecc7461
parenta83daab36ae8c4a4f5b1a5eba57d6356a020ab74
merge branche dev
buildout.cfg
project/budget/admin.py
project/budget/models.py
project/rh/admin.py
project/rh/models.py