[znc-infobot/f15: 3/3] Merge branch 'master' into f15

[Nick Bebout]

commit 18b6bb63d5b0e093660b71deb57b4812c47c6840
Merge: 5e66a67 6957d85
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Feb 9 17:04:04 2012 -0600

    Merge branch 'master' into f15

 znc-infobot.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---