Merge branch 'olivier' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 30 Mar 2012 14:11:23 +0000 (10:11 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 30 Mar 2012 14:11:23 +0000 (10:11 -0400)
commit7e552f0dd58683d58cbc3f8194665027d76fb4c3
treeceee8a0f73e05c96a446856fc99d0cf0073d77cb
parent96c0e7894e4147a447c6df0c674e6d5127e73aa8
parent5ce89af9cb443d211ef0ad0accaebc38a53c24f4
Merge branch 'olivier' into dev