[Pound/el5: 46/47] Merge branch 'el6' into el5

[Lubomir Rintel]

commit 8a579edf20dc72fcd54c965b27b2aace5e9b1872
Merge: 3290e76 0de31a2
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Fri Oct 24 17:29:29 2014 +0200

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	Pound.spec
    	sources

 .gitignore                                         |    3 +-
 ...89-BEAST-Add-options-preventing-users-fro.patch |  381 ++++++++++++++++++++
 ...E-2012-4929-CRIME-Disable-SSL-compression.patch |   88 +++++
 0003-Fix-a-XSS-with-a-crafted-URL.patch            |   80 ++++
 ...-2090-chunked-encoding-response-splitting.patch |   81 +++++
 ...3566-POODLE-Backport-Disable-proto-option.patch |   86 +++++
 Pound.spec                                         |  133 ++++++-
 sources                                            |    2 +-
 8 files changed, 836 insertions(+), 18 deletions(-)
---