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

[Robert Scheck]

commit e23a3ee44a4399985feebfeb9170910410b273f9
Merge: 74f54a1 ac56664
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Dec 8 17:00:16 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                  |   62 ++++++++++++++++++++++------
 sources                        |    2 +-
 4 files changed, 49 insertions(+), 119 deletions(-)
---