[supybot-notify/el6: 4/4] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit 4acb75835776404662f9226de2f9b4798ae1379b
Merge: 3ab0d8f b6f06e1
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Oct 13 17:10:22 2011 -0600

    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	supybot-notify.spec

 .gitignore          |    2 +-
 sources             |    2 +-
 supybot-notify.spec |    8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index cfe5ea5,909a40e..061d641
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/supybot-notify-0.2.1.tar.xz
+ /supybot-notify-0.2.2.tar.xz