commit 92fe4374bb166ddc328fa398fdaf664f910331b9 Merge: c7eaa13 7d1112e Author: Nick Bebout <nb at fedoraproject.org> Date: Thu Feb 24 19:56:32 2011 -0600 Merge branch 'el6' into el5 znc.spec | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) ---