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

Merge
---

de7834267e2ff8f28a2cb49647fc91e060686e93