]> www.wagner.pp.ru Git - fiction/jasmina.git/commitdiff
Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
authorVictor Wagner <wagner@atlas-card.ru>
Tue, 24 Feb 2015 08:35:05 +0000 (11:35 +0300)
committerVictor Wagner <wagner@atlas-card.ru>
Tue, 24 Feb 2015 08:35:05 +0000 (11:35 +0300)

Trivial merge