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

[Nick Bebout]

commit cf240a31863cbf60bd62f76658806573bf5f6069
Merge: 1ceb799 428c95d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Sep 24 20:31:36 2010 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 sources    |    2 +-
 znc.spec   |   15 +++++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)
---