merge dev with import RH
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 18 Jan 2012 18:03:41 +0000 (13:03 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 18 Jan 2012 18:03:41 +0000 (13:03 -0500)
commit865ca9e053bae9dd3ce3dd5ffce3202afdec6e4d
tree36ae75267c1ff0e459eeee3b423385870d914b05
parent85949c639fd69640b7e26389c9aa78ffea36c240
parent208022f60b0dffa44ebdf9acb8c35ca8f18785ed
merge dev with import RH
project/rh/migrations/0007_auto__del_evenement__del_evenementremuneration__chg_field_poste_respon.py
project/rh/models.py
project/settings.py