[znc/el5/master: 39/39] Merge branch 'el5/master' of ssh://pkgs.fedoraproject.org/znc into el5

[Nick Bebout]

commit b55909941a82e9d8b5a665aaa4fa91e34f1d6ff7
Merge: 92fe437 914652f
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Feb 24 19:59:00 2011 -0600

    Merge branch 'el5/master' of ssh://pkgs.fedoraproject.org/znc into el5
    
    Conflicts:
    	.gitignore
    	sources
    	znc.spec

 znc.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---