From: Victor Wagner <vitus@wagner.pp.ru>
Date: Wed, 27 Apr 2016 12:22:20 +0000 (+0300)
Subject: Merge branch 'master' of http://wagner.pp.ru/git/oss/catdoc
X-Git-Tag: REL_0_95~1^2~2
X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=oss%2Fcatdoc.git;a=commitdiff_plain;h=26ea699acb7f01e0b3431fd6173feb1f09094d8e;hp=26ea699acb7f01e0b3431fd6173feb1f09094d8e

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

Conflicts:
	src/fileutil.c
---