merge master
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 28 Jun 2012 15:29:25 +0000 (11:29 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 28 Jun 2012 15:29:25 +0000 (11:29 -0400)
commitf80b83c6040766aa39fbc224edcc33bacb876319
tree932cde7d88f499780038c5e8c795716690d3f725
parent7013d23417540aa6cd2b022541c223f4bcef20cb
parenta3d7143b9ce1a97d4deb2360835b5172c7de977d
merge master
project/dae/admin.py
project/dae/models.py
project/rh/admin.py
project/rh/managers.py
project/rh/migrations/0031_supprimer_objets_flag_supprime.py
project/rh/migrations/0032_auto__del_field_postecomparaison_supprime__del_field_postecomparaison_.py
project/rh/migrations/0033_rebase.py
project/rh/models.py
project/rh/views.py
versions.cfg