From: Victor Wagner Date: Wed, 27 Aug 2014 18:54:52 +0000 (+0400) Subject: Merge branch 'master' of /work/git/fiction/jasmina X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=fiction%2Fjasmina.git;a=commitdiff_plain;h=a1146a2029ac36ae6fc600cc5d2183746edf6db7 Merge branch 'master' of /work/git/fiction/jasmina --- a1146a2029ac36ae6fc600cc5d2183746edf6db7