---
- branch: MAIN
  date: Sat Jan 11 18:34:37 UTC 2014
  files:
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssl/dist/Configure
    pathrev: src/crypto/external/bsd/openssl/dist/Configure@1.6
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/crypto/external/bsd/openssl/dist/crypto/opensslv.h
    pathrev: src/crypto/external/bsd/openssl/dist/crypto/opensslv.h@1.7
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c
    pathrev: src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c@1.4
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
    pathrev: src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c@1.3
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c
    pathrev: src/crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c@1.6
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c
    pathrev: src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c@1.5
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_client_CA_list.pod
    pathrev: src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_client_CA_list.pod@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_accept.pod
    pathrev: src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_accept.pod@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_do_handshake.pod
    pathrev: src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_do_handshake.pod@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_shutdown.pod
    pathrev: src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_shutdown.pod@1.3
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c@1.7
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h@1.7
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c@1.7
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/crypto/external/bsd/openssl/dist/ssl/d1_srvr.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/d1_srvr.c@1.4
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/crypto/external/bsd/openssl/dist/ssl/s23_clnt.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/s23_clnt.c@1.5
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/crypto/external/bsd/openssl/dist/ssl/ssl.h
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/ssl.h@1.5
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/crypto/external/bsd/openssl/dist/ssl/ssl3.h
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/ssl3.h@1.5
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.c@1.8
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c@1.10
    type: modified
  - new: '1.13'
    old: '1.12'
    path: src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c@1.13
    type: modified
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c@1.14
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssl/dist/ssl/ssltest.c
    pathrev: src/crypto/external/bsd/openssl/dist/ssl/ssltest.c@1.6
    type: modified
  - new: '0'
    old: '1.3'
    path: src/crypto/external/bsd/openssl/dist/test/test_aesni
    pathrev: src/crypto/external/bsd/openssl/dist/test/test_aesni@0
    type: deleted
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version
    pathrev: src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version@1.8
    type: modified
  - new: '1.2'
    old: '1.1'
    path: src/crypto/external/bsd/openssl/lib/libdes/shlib_version
    pathrev: src/crypto/external/bsd/openssl/lib/libdes/shlib_version@1.2
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssl/lib/libssl/shlib_version
    pathrev: src/crypto/external/bsd/openssl/lib/libssl/shlib_version@1.8
    type: modified
  id: 20140111T183437Z.e5a2c71a436b574643147fbbe14bb363eef5e352
  log: "merge conflicts\n"
  module: src
  subject: 'CVS commit: src/crypto/external/bsd/openssl'
  unixtime: '1389465277'
  user: christos