From: Victor Wagner <vitus@wagner.pp.ru>
Date: Sat, 9 Aug 2014 13:19:23 +0000 (+0400)
Subject: Merge branch 'master' of /work/git/fiction/jasmina
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=23743026edfe2885fd6a552c130b7ea3f80c318a;p=fiction%2Fjasmina.git

Merge branch 'master' of /work/git/fiction/jasmina
---

23743026edfe2885fd6a552c130b7ea3f80c318a