From: Victor Wagner <vitus@wagner.pp.ru>
Date: Wed, 24 Feb 2016 19:31:39 +0000 (+0300)
Subject: Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=f1cde09ca3ed9b367a93927931de81bfa9d69880;p=fiction%2Fjasmina.git

Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
---

f1cde09ca3ed9b367a93927931de81bfa9d69880