From: Côme BERNIGAUD <come.bernigaud@gmail.com>
Date: Fri, 20 May 2011 08:07:56 +0000 (+0200)
Subject: merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=46cff1de1e828cb8c04a5dc5377bc07baae57858;p=lugaru.git

merge
---

46cff1de1e828cb8c04a5dc5377bc07baae57858