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

[Nick Bebout]

commit 2a21243833ba08ecf858af2d14e9dc60d02fa181
Merge: 18b6bb6 2e4d158
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Feb 9 17:56:19 2012 -0600

    Merge branch 'master' into f15

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