From: Victor Wagner <vitus@wagner.pp.ru>
Date: Tue, 1 Aug 2017 06:43:44 +0000 (+0300)
Subject: Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=68ee9927c00ab81044b32708035b2dea891d6db8;hp=68ee9927c00ab81044b32708035b2dea891d6db8;p=fiction%2Fjasmina.git

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