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)
commit59325793f5368e5eb82da49328ae9a580c33b8e0
tree69d8cb5be516c054ce9514793220f517b06d36a4
parent666a23f1c6f51c09f4aa4ad7e863bf901025a82f
parentd9cb3fb664ac9f9684eaa76e916c90d1516855bc
Merge branch 'master' of wagner.pp.ru/git/oss/catdoc