Merge branch 'master' of http://wagner.pp.ru/git/oss/catdoc

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

Thu, 28 Apr 2016 04:34:58 +0000 (07:34 +0300)

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

Thu, 28 Apr 2016 04:34:58 +0000 (07:34 +0300)
author Victor Wagner <vitus@wagner.pp.ru>
Thu, 28 Apr 2016 04:34:58 +0000 (07:34 +0300)
committer Victor Wagner <vitus@wagner.pp.ru>
Thu, 28 Apr 2016 04:34:58 +0000 (07:34 +0300)
diff --cc src/ole.c
Simple merge
diff --cc src/substmap.c
Simple merge
author	Victor Wagner <vitus@wagner.pp.ru>
	Thu, 28 Apr 2016 04:34:58 +0000 (07:34 +0300)
committer	Victor Wagner <vitus@wagner.pp.ru>
	Thu, 28 Apr 2016 04:34:58 +0000 (07:34 +0300)
		1	2
src/ole.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/substmap.c	patch \|	diff1 \|	diff2 \|	blob \| history