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

[Nick Bebout]

commit 3923bf1f207612dc3fc22d001243b0860123655d
Merge: 32dcb9e 485cb0f
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Aug 15 20:49:28 2011 -0500

    Merge branch 'master' into el6

 znc.spec |   59 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 19 deletions(-)
---