Merge branch 'master' of http://wagner.pp.ru/git/oss/catdoc
authorVictor Wagner <vitus@wagner.pp.ru>
Wed, 27 Apr 2016 12:22:20 +0000 (15:22 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Wed, 27 Apr 2016 12:22:20 +0000 (15:22 +0300)
commit26ea699acb7f01e0b3431fd6173feb1f09094d8e
treeb429cadbc3e3e33e126af3b16eb21a05c481f82f
parent73b1dd7326585b7c18ce6e24320656d0d6f843cc
parent4c1c2b85914997dfaab4718b2723bdb5ba2ef779
Merge branch 'master' of wagner.pp.ru/git/oss/catdoc

Conflicts:
src/fileutil.c
src/charsets.c
src/fileutil.c