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

[Nick Bebout]

commit 0c3f26f99c397da0b3d8ec46f7b17194c9d09688
Merge: 05dc826 dc98579
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Nov 6 22:56:10 2010 -0400

    Merge branch 'master' into el5

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |   12 ++++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)
---