---
- branch: MAIN
  date: Wed Aug  5 18:38:22 UTC 2009
  files:
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/apps/ca.c
    pathrev: src/crypto/external/bsd/openssl/dist/apps/ca.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c
    pathrev: src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c
    pathrev: src/crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/crypto/lhash/lhash.h
    pathrev: src/crypto/external/bsd/openssl/dist/crypto/lhash/lhash.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c@1.3
    type: modified
  id: 20090805T183822Z.fdd96763797ce1797a742ced2d048e344410d53a
  log: "resolve conflicts\n"
  module: src
  subject: 'CVS commit: src/crypto/external/bsd/openssl/dist'
  unixtime: '1249497502'
  user: christos