Merge branch 'olivier' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 30 Mar 2012 15:02:08 +0000 (11:02 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 30 Mar 2012 15:02:08 +0000 (11:02 -0400)
commit8460277507ed4a819294d73ee9133dfabddcc558
tree8fdfccd5dcbc441fa69c0607aa73d8db1a73653d
parent7e552f0dd58683d58cbc3f8194665027d76fb4c3
parent5dfc3761b37f8515410cb1510da34e2c0e2170ef
Merge branch 'olivier' into dev