From: Alexander Monakov <amonakov@gmail.com>
Date: Sun, 6 Jun 2010 17:10:19 +0000 (+0400)
Subject: Merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=bbebd42229325d9f25a0360074e587dc2cc25e7e;p=lugaru.git

Merge
---

bbebd42229325d9f25a0360074e587dc2cc25e7e