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

[Nick Bebout]

commit aea04c82f2abac63953c4150571b80b4e6ca6856
Merge: 8719fe3 5ab3382
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Apr 1 23:19:11 2011 +0000

    Merge branch 'master' into f13

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |   18 +++++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)
---