[stunnel/f19: 7/7] merge from master

[avesh]

commit c02d1c349f49a3ab3e01f9d5c26166cbc8f7d8c9
Merge: fa121d9 4074c05
Author: Avesh Agarwal <avagarwa at redhat.com>
Date:   Thu Apr 17 17:01:03 2014 -0400

    merge from master

 .gitignore                                         |    7 ++++-
 sources                                            |    6 ++--
 ...el-4-authpriv.patch => stunnel-5-authpriv.patch |   26 ++++++++--------
 stunnel-4-sample.patch => stunnel-5-sample.patch   |    6 ++--
 stunnel.spec                                       |   32 +++++++++++++++-----
 5 files changed, 49 insertions(+), 28 deletions(-)
---