From: Ryan C. Gordon <icculus@icculus.org>
Date: Thu, 13 May 2010 05:25:44 +0000 (-0400)
Subject: Merge.
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=d54afb674b2f5fc9cedab89c3ff985a6c0419dee;p=lugaru.git

Merge.
---

d54afb674b2f5fc9cedab89c3ff985a6c0419dee