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

[Nick Bebout]

commit 5e577e0846e1fff464185916f99fc571bed03832
Merge: 968f661 bf0dd5f
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Jan 24 19:10:48 2012 -0600

    Merge branch 'master' into el6

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