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

[Nick Bebout]

commit bc2133efaa51860c04387c03ba4e091a9ab1d22b
Merge: 5b3d8c4 bf0dd5f
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Jan 24 19:10:51 2012 -0600

    Merge branch 'master' into el5

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