Merge branch 'master' of ssh://www.wagner.pp.ru/work/git/fiction/jasmina

author Victor Wagner <vitus@wagner.pp.ru>

Wed, 13 Aug 2014 18:10:06 +0000 (22:10 +0400)

committer Victor Wagner <vitus@wagner.pp.ru>

Wed, 13 Aug 2014 18:10:06 +0000 (22:10 +0400)
author Victor Wagner <vitus@wagner.pp.ru>
Wed, 13 Aug 2014 18:10:06 +0000 (22:10 +0400)
committer Victor Wagner <vitus@wagner.pp.ru>
Wed, 13 Aug 2014 18:10:06 +0000 (22:10 +0400)
diff --cc embassy.txt
Simple merge
diff --cc jenni.txt
Simple merge
author	Victor Wagner <vitus@wagner.pp.ru>
	Wed, 13 Aug 2014 18:10:06 +0000 (22:10 +0400)
committer	Victor Wagner <vitus@wagner.pp.ru>
	Wed, 13 Aug 2014 18:10:06 +0000 (22:10 +0400)
		1	2
embassy.txt	patch \|	diff1 \|	diff2 \|	blob \| history
jenni.txt	patch \|	diff1 \|	diff2 \|	blob \| history