From: Vadim Trochinsky <vadim.trochinsky@gmail.com>
Date: Fri, 21 May 2010 21:25:34 +0000 (+0200)
Subject: merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=sidebyside;h=5c4dee6a92fa23796ada28e5e42dee7721230d3e;hp=--cc;p=lugaru.git

merge
---

5c4dee6a92fa23796ada28e5e42dee7721230d3e