From: Victor Wagner Date: Tue, 12 Aug 2014 07:02:58 +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=96e1d06229d20433f2b8a794ab65e77ecae58d75 Merge branch 'master' of /work/git/fiction/jasmina --- 96e1d06229d20433f2b8a794ab65e77ecae58d75