]> wagner.pp.ru Git - fiction/jasmina.git/commitdiff
Merge branch 'master' of ssh://www.wagner.pp.ru/work/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Mon, 11 Aug 2014 16:38:31 +0000 (20:38 +0400)
committerVictor Wagner <vitus@wagner.pp.ru>
Mon, 11 Aug 2014 16:38:31 +0000 (20:38 +0400)
1  2 
jenni.txt

diff --cc jenni.txt
Simple merge