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

[Nick Bebout]

commit dfa23daa5d587bd5b37d1f5ec2bd7f68c75b2a6a
Merge: f9061f4 6d52a74
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Aug 12 05:36:45 2014 -0500

    Merge branch 'master' into el6

 znc-infobot.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---