From: Ryan C. Gordon <icculus@icculus.org>
Date: Fri, 14 May 2010 06:04:01 +0000 (-0400)
Subject: Merge.
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=4077141d40ad4cf2c77b9531580283c6e0dffcb6;p=lugaru.git

Merge.
---

4077141d40ad4cf2c77b9531580283c6e0dffcb6