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

[Nick Bebout]

commit 968f6611f9bd24f152facc804c5df842f1bf3fb7
Merge: 839aa19 97507d9
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Jan 23 15:13:13 2012 -0600

    Merge branch 'master' into el6

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