Merge branch 'master' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 25 Apr 2012 14:26:51 +0000 (10:26 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 25 Apr 2012 14:26:51 +0000 (10:26 -0400)
commitdb381edd72dde2fb673a6c79f12a4d78b4e6b411
treeb441e8ab08dd3affecf12d6e70353511e842401d
parentc1830e927406187fc48804b6ec6e945f7457b0fb
parente57655ce6f2f665e9b94d5c101adebe6db7991c9
Merge branch 'master' into test