[znc/el4: 2/2] Merge branch 'master' into el4

[Nick Bebout]

commit cb7d993693b30f359d8bfcdbfdade3b96ff59dae
Merge: 3f3ac14 bf0dd5f
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Jan 24 19:10:53 2012 -0600

    Merge branch 'master' into el4

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