From: Victor Wagner Date: Thu, 30 Apr 2015 11:44:16 +0000 (+0300) Subject: Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=fiction%2Fjasmina.git;a=commitdiff_plain;h=6403f8908b36126e6b292aaad53537b08beed9df Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina --- 6403f8908b36126e6b292aaad53537b08beed9df