commit 5eb0ef11e75b5c507ccbba9db2b3d37803184cda Merge: dcb1b65 0393dbd Author: Nick Bebout <nb at fedoraproject.org> Date: Mon Jan 24 11:27:47 2011 -0600 Merge branch 'master' into el5 .gitignore | 3 +++ sources | 2 +- znc.spec | 27 ++++++++++++++++++++------- 3 files changed, 24 insertions(+), 8 deletions(-) ---