[supybot-meetbot/el6] (3 commits) ...Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

Summary of changes:

  29a4a26... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  c6428dc... Add patch from Michael Scherer to show what undo undid. (*)
  88e9482... Merge remote-tracking branch 'origin/master' into el6

(*) This commit already existed in another branch; no separate mail sent