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

[Paul Komkoff]

commit c881b1bfd8b99be7ba80c98b39313abb86825761
Merge: c45292a 7546028
Author: Paul P. Komkoff <i at stingr.net>
Date:   Sun Jul 1 12:24:58 2012 +0400

    Merge branch 'master' into f17

 .gitignore   |    2 +-
 sources      |    2 +-
 weechat.spec |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)
---