[ca-certificates: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ca-certificates

[Kai Engert]

commit ec67e63d7a660255e26a166a1affe73314efc989
Merge: ed9b40a 04d3dc5
Author: Kai Engert <kaie at redhat.com>
Date:   Tue Sep 3 13:07:33 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ca-certificates
    
    Conflicts:
    	ca-certificates.spec

 ca-certificates.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---