Merge branch 'test' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 31 May 2011 21:46:44 +0000 (17:46 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 31 May 2011 21:46:44 +0000 (17:46 -0400)
commitefb3df5b7aa0ad56cd970dbe06c4a74a31103641
tree9a1eff0cac45df00702947c4464a00cf861617b0
parentc86febe11da5e1c4c28ccb27b06220c3a7c0bcfd
parentbcc6fa3f0d814db6bcfe8df8f5ba3686465fe269
Merge branch 'test' into dev