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

[Jamie Nguyen]

commit dbf427fb2785d8e0b47790b1de385402696fc888
Merge: c9a7448 0231c01
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Tue Apr 2 11:49:21 2013 +0100

    Merge branch 'master' into f17

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