---
- branch: MAIN
  date: Sun Jul 31 10:05:04 UTC 2011
  files:
  - new: '1.4'
    old: '1.3'
    path: src/external/ibm-public/postfix/dist/makedefs
    pathrev: src/external/ibm-public/postfix/dist/makedefs@1.4
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/ibm-public/postfix/dist/postfix-install
    pathrev: src/external/ibm-public/postfix/dist/postfix-install@1.3
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/external/ibm-public/postfix/dist/html/TLS_README.html
    pathrev: src/external/ibm-public/postfix/dist/html/TLS_README.html@1.5
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/ibm-public/postfix/dist/html/postconf.5.html
    pathrev: src/external/ibm-public/postfix/dist/html/postconf.5.html@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/ibm-public/postfix/dist/man/man5/postconf.5
    pathrev: src/external/ibm-public/postfix/dist/man/man5/postconf.5@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/ibm-public/postfix/dist/proto/postconf.proto
    pathrev: src/external/ibm-public/postfix/dist/proto/postconf.proto@1.8
    type: modified
  id: 20110731T100504Z.82636716b005f6d069b6e7f6a263bca64d886f90
  log: |
    Resolve conflicts from last import.
  module: src
  subject: 'CVS commit: src/external/ibm-public/postfix/dist'
  unixtime: '1312106704'
  user: tron