Merge branch 'master' of http://www.wagner.pp.ru/git/oss/catdoc
authorVictor Wagner <vitus@wagner.pp.ru>
Tue, 26 Apr 2016 17:59:45 +0000 (20:59 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Tue, 26 Apr 2016 17:59:45 +0000 (20:59 +0300)

Trivial merge