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

[Nick Bebout]

commit 8719fe3ba79d8b80b31c8c18f6ec21aaa5a80b64
Merge: 003447f a52b503
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Mar 12 13:33:52 2011 -0600

    Merge branch 'master' into f13

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