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

[Paul Komkoff]

commit c45292a4c4d40166372c342d5b71a0669e561063
Merge: 76238ed 48139c8
Author: Paul P. Komkoff <i at stingr.net>
Date:   Fri Mar 16 19:27:58 2012 +0400

    Merge branch 'master' into f17

 .gitignore             |    1 +
 sources                |    2 +-
 weechat-combined.patch |  249 +++++++++++++++++++-----------------------------
 weechat.spec           |    8 +-
 4 files changed, 107 insertions(+), 153 deletions(-)
---