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

[Nick Bebout]

commit a5ee66d1786eee8515a2506fa3d50111142e0413
Merge: b4d9368 fa6140c
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Aug 15 21:23:47 2011 -0500

    Merge branch 'master' into f14

 znc.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---