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