[supybot-fedora/el6: 14/14] Merge branch 'master' into el6

[Patrick Uiterwijk]

commit 20fa1e5dbb69faa176e3c88913b69d105257572a
Merge: 9fc6aa4 8d36e69
Author: Patrick Uiterwijk <puiterwijk at gmail.com>
Date:   Fri May 3 21:02:59 2013 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	supybot-fedora.spec

 .gitignore          |    3 ++-
 sources             |    2 +-
 supybot-fedora.spec |   31 ++++++++++++++++++++++++++++---
 3 files changed, 31 insertions(+), 5 deletions(-)
---
diff --cc supybot-fedora.spec
index d84c50e,a1ed5f8..690f473
--- a/supybot-fedora.spec
+++ b/supybot-fedora.spec
@@@ -1,7 -1,7 +1,11 @@@
  %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
  
  Name:           supybot-fedora
++<<<<<<< HEAD
 +Version:        0.2.9.1
++=======
+ Version:        0.2.11
++>>>>>>> master
  Release:        1%{?dist}
  Summary:        Plugin for Supybot to interact with Fedora services