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

[Nick Bebout]

commit a7de384e6e7383244b7c368cbdf622de3e342ce8
Merge: 3a5f533 bfb86d8
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Mar 3 17:27:25 2011 -0600

    Merge branch 'master' into f14

 .gitignore        |    1 +
 sources           |    2 +-
 znc-release.patch |   11 +++++++++++
 znc.spec          |   11 ++++++++---
 4 files changed, 21 insertions(+), 4 deletions(-)
---