[weechat/f17: 2/2] Merge branch 'master' into f17

[Paul Komkoff]

commit 4684a3d8c2bce06c909d74157c6104a07baa7b22
Merge: 4ff2034 6ff05c4
Author: Paul P. Komkoff <i at stingr.net>
Date:   Sat Dec 1 01:36:07 2012 +0400

    Merge branch 'master' into f17

 .gitignore             |    1 +
 sources                |    2 +-
 weechat-combined.patch |  260 ++++++++++++++++++++++++++++-------------------
 weechat-fix-0.patch    |  142 --------------------------
 weechat-fix-1.patch    |  264 ------------------------------------------------
 weechat.spec           |   11 +-
 6 files changed, 163 insertions(+), 517 deletions(-)
---