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