Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 25 May 2011 18:33:13 +0000 (14:33 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 25 May 2011 18:33:13 +0000 (14:33 -0400)
commit47fe0a69031722db36a233fcceff035f7aa9e9e4
treef472340cd7ff6ff9c23c6e21e10334a3330b29ef
parent70f0e9a421f737c83b6a37fde64a10cfba98ecaa
parent0af51c9438f817cd4da7a655decc9c969f0f569b
Merge branch 'dev' into test