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

[Nick Bebout]

commit e23b3a6bea5245cb722e32707b096ae12e8ecd90
Merge: ea2c6e8 428c95d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Sep 24 20:31:17 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

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