[libvmime/el5: 6/6] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 74f54a112b23f5ed40249a4192846c7af575e617
Merge: afd059f 651eeed
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Mar 23 19:45:12 2013 +0100

    Merge remote branch 'origin/master' into el5

 libvmime-0.9.2-gnutls.patch    |   86 ++++++++++++++++++++++++++++++++++++++++
 libvmime-0.9.2-soversion.patch |   18 ++++++++
 libvmime.spec                  |   51 ++++++++++++++++--------
 sources                        |    2 +-
 4 files changed, 139 insertions(+), 18 deletions(-)
---