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

[Jamie Nguyen]

commit 0c6ac8bfeb80f2d21b2594729ca143062445aaf2
Merge: d63e38d 17d3ce2
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Jan 21 12:36:39 2013 +0000

    Merge branch 'master' into f17

 .gitignore              |    1 +
 sources                 |    2 +-
 weechat-0.4.0-pie.patch |   67 +++++
 weechat-combined.patch  |  752 -----------------------------------------------
 weechat.spec            |   20 +-
 5 files changed, 85 insertions(+), 757 deletions(-)
---