[supybot-meetbot/el6: 10/10] Merge branch 'master' into el6

[Toshio くらとみ]

commit 0de19d6c77566feead219d9125c217b6dd84db24
Merge: 5eda37c 8ff71dc
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed May 15 13:25:50 2013 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	supybot-meetbot.spec

 meetbot-unicode-meeting-name.patch |   33 +++++++++++++++++++++++++++++++++
 supybot-meetbot.spec               |    8 +++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --cc supybot-meetbot.spec
index a1633dd,7a97f67..9ff0e0f
--- a/supybot-meetbot.spec
+++ b/supybot-meetbot.spec
@@@ -44,9 -47,27 +47,12 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/supybot/plugins/MeetBot
  
  %changelog
+ * Wed May 15 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1.4-10
+ - Fix for traceback if meeting names contain non-ascii chars
+ 
 -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-9
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-8
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-7
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Mon Apr 18 2011 Dave Riches <david.r at ultracar.co.uk> - 0.1.4-6
 +* Tue Apr 19 2011 Dave Riches <david.r at ultracar.co.uk> - 0.1.4-4
  - added requires /usr/bin/supybot to fix dependency issue
  
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.1.4-4
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 -
  * Fri Sep 11 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.4-3
  - Add default css files.