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

[Nick Bebout]

commit 869c25d801df26c7c6e6ec0b956323bd0f8f9787
Merge: 1adb1cd d7ccc14
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 18 19:57:56 2012 -0600

    Merge branch 'master' into el5

 znc-infobot-1.0-znc1.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 znc-infobot.spec           |   17 ++++++++++++++---
 2 files changed, 58 insertions(+), 3 deletions(-)
---