---
- branch: MAIN
  date: Sun Sep 15 17:33:20 UTC 2013
  files:
  - new: '1.3534'
    old: '1.3533'
    path: pkgsrc/doc/CHANGES-2013
    pathrev: pkgsrc/doc/CHANGES-2013@1.3534
    type: modified
  id: 20130915T173320Z.7127af7d0a83190a9f929eb3c570e060d8b0648e
  log: "Remove conflict.\n"
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/doc'
  unixtime: '1379266400'
  user: wiz