Merge branch 'dev' into rh
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 1 Jun 2011 13:52:01 +0000 (09:52 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 1 Jun 2011 13:52:01 +0000 (09:52 -0400)
commitff1d89929a9469e01042dd2ac18147eea408562c
tree5e2536d21b5e810b7f0e94f5a195ba78b1d4ec3d
parente9d7483c2d1a507d4c8ee33e837b9b2a599700f0
parentffedebf0d2c02c67ad0b930d0ab237bd594162cf
Merge branch 'dev' into rh