[ssldump/el6: 6/6] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 75a292fe9ba5f29800c79e554bda687abbb6019e
Merge: e696850 e3c46a0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon May 12 00:25:25 2014 +0200

    Merge remote branch 'origin/master' into el6

 ssldump-0.9-ciphersuites.patch |  161 ++++
 ssldump-0.9-link_layer.patch   |   91 ++
 ssldump-0.9-pcap-vlan.patch    |   36 +
 ssldump-0.9-ssl-enums.patch    | 1806 ++++++++++++++++++++++++++++++++++++++++
 ssldump-0.9-tlsv12.patch       |  218 +++++
 ssldump.spec                   |   31 +-
 6 files changed, 2342 insertions(+), 1 deletions(-)
---