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

[Nick Bebout]

commit 6211e02babd1157eaaa80b52087ffd07944d60bc
Merge: a92d1dc 5ab3382
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Apr 1 23:17:52 2011 +0000

    Merge branch 'master' into f14

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