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)
commit7490451ae999b0418f189a90ec110c281c9d8d10
tree0aa2edc77ace0b68920ea11be69160f81a95f923
parentf03d3bbce7b36e358df5ee15fab1af190ffcad5a
parentb7046520d2de550b7ac99599546fe0a5673470e6
Merge branch 'master' of wagner.pp.ru/git/oss/catdoc