From: Victor Wagner Date: Mon, 11 Aug 2014 16:38:31 +0000 (+0400) Subject: Merge branch 'master' of ssh://www.wagner.pp.ru/work/git/fiction/jasmina X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=fiction%2Fjasmina.git;a=commitdiff_plain;h=40406b31c09f92a91cb45dabaf143a7cb0abe30a Merge branch 'master' of ssh://www.wagner.pp.ru/work/git/fiction/jasmina --- 40406b31c09f92a91cb45dabaf143a7cb0abe30a