[supybot-meetbot/el6: 3/3] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit 88e9482f7bfd7eec9d4e5857e8587a524e6e58f1
Merge: 0de19d6 c6428dc
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Jan 5 11:00:34 2014 -0700

    Merge remote-tracking branch 'origin/master' into el6

 meetbot-show_string_on_remove.patch |   13 +++++++++++++
 supybot-meetbot.spec                |   10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---