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

[Nick Bebout]

commit 0154699e6d6a2ccebc19d8f799f7b7a230351f5f
Merge: 2a21243 49e79a7
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Apr 21 17:14:26 2012 -0500

    Merge branch 'master' into f15

 znc-infobot.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---