[gnutls/f19: 13/14] Merge branch 'f20' into f19

[Nikos Mavrogiannopoulos]

commit 054b04f57bbb3b81ca4455786d8c21bee20e381d
Merge: 5cc08af aa2c065
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Thu Jan 2 11:02:13 2014 +0100

    Merge branch 'f20' into f19

 gnutls-3.1.18-suiteb.patch |   11 ++++++++---
 gnutls.spec                |    5 ++++-
 2 files changed, 12 insertions(+), 4 deletions(-)
---