[nss/f19: 10/10] Merge branch 'f20' into f19

[Elio Maldonado]

commit 6f4e83e8f5db96939f6561e1cad935078158668e
Merge: a74ad95 930689d
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu May 8 07:55:42 2014 -0700

    Merge branch 'f20' into f19

 .gitignore   |    2 +-
 iquote.patch |   56 ++++++++++++++++++++++++++++++++++----------------------
 nss.spec     |   49 ++++++++++++++++++++++++++++++++++++-------------
 sources      |    2 +-
 4 files changed, 72 insertions(+), 37 deletions(-)
---