[znc-infobot/el5: 8/8] Merge branch 'el6' into el5

[Nick Bebout]

commit ffaab7f383cbd29ee0ce5801c4cb19071fa19556
Merge: 49d2524 ed6c4de
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Oct 18 20:39:33 2011 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	sources
    	znc-infobot.spec

 .gitignore       |    2 +-
 sources          |    2 +-
 znc-infobot.spec |   16 +++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)
---