[znc-infobot/f18: 6/6] Merge branch 'master' into f18

[Nick Bebout]

commit 5059cd74ea574fab71f122dfd540b275baf32bc3
Merge: d0a1a03 f86d7b5
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Oct 17 20:53:36 2013 -0500

    Merge branch 'master' into f18
    
    Conflicts:
    	znc-infobot.spec

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