Merge branch 'master' of http://www.wagner.pp.ru/git/oss/catdoc
authorVictor Wagner <vitus@wagner.pp.ru>
Wed, 25 May 2016 04:37:12 +0000 (07:37 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Wed, 25 May 2016 04:37:12 +0000 (07:37 +0300)

Trivial merge