[nss-util/f21: 2/2] Merge branch 'master' into f21

[Elio Maldonado]

commit c710f889ed7d50d7514f8cab834aac714dc311e3
Merge: a400a3f ffbe35a
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Mar 23 07:15:03 2015 -0700

    Merge branch 'master' into f21
    
    - Rebase to nss-3.18

 .gitignore    | 2 +-
 nss-util.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---