From: Svjatoslav Agejenko <svjatoslav@svjatoslav.eu>
Date: Fri, 14 Sep 2018 19:01:47 +0000 (+0300)
Subject: Merge branch 'master' of ssh://svjatoslav.eu:10006/home/n0/git/meviz
X-Git-Tag: meviz-1.2~29
X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=commitdiff_plain;h=849de223371b2e7395f52ce05a6627f8a213e6a9;p=meviz.git

Merge branch 'master' of ssh://svjatoslav.eu:10006/home/n0/git/meviz

# Conflicts:
#	meviz.iml
---

849de223371b2e7395f52ce05a6627f8a213e6a9