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

[Nick Bebout]

commit 1adb1cd8910e33840f85b9818818f4f30b2fab82
Merge: 3e01f67 49e79a7
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Apr 21 17:15:05 2012 -0500

    Merge branch 'master' into el5

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