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

[Vít Ondruch]

commit 76238edcb55b1831f882380f3c2f62eb58bd46d7
Merge: a65872a 28cbd0e
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Feb 8 09:28:51 2012 +0100

    Merge branch 'master' into f17

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