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

[Nick Bebout]

commit ed6c4de8d4cd1d365e13a6ed463bb42838d0671b
Merge: 8ce4f2a 0e044ab
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Oct 18 20:38:14 2011 -0500

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

 .gitignore       |    2 +-
 sources          |    2 +-
 znc-infobot.spec |   16 +++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 14185e3,3c15940..d18e483
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/znc-infobot-0.200.tar.gz
+ /znc-infobot-0.202.tar.gz