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

[Nick Bebout]

commit a92d1dcb8c710b12369c0b7cb896388ed1c16823
Merge: a7de384 a52b503
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Mar 12 13:33:25 2011 -0600

    Merge branch 'master' into f14

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