From: Alexander Monakov <amonakov@gmail.com>
Date: Sat, 5 Jun 2010 22:08:31 +0000 (+0400)
Subject: Merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=6468ba0b10be934e097a7b841333e9f168ca34fb;p=lugaru.git

Merge
---

6468ba0b10be934e097a7b841333e9f168ca34fb