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

[Paul Komkoff]

commit d63e38db87e93e7a66fed85298ef7dff88b67061
Merge: 4684a3d cf5dce2
Author: Paul P. Komkoff <i at stingr.net>
Date:   Sun Dec 2 21:46:56 2012 +0400

    Merge branch 'master' into f17

 weechat.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---