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

[Nick Bebout]

commit 2e6a7b80edd5e9c3caaa09757c1833dbf6ce3f66
Merge: 3f4213f 49e79a7
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Apr 21 17:14:49 2012 -0500

    Merge branch 'master' into el6

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