[bitlbee/el6: 2/2] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 39f287e15f8a37d1681f5e85c14a852de2514c0c
Merge: e13194c 0915fe5
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Mar 14 03:08:01 2013 +0100

    Merge remote branch 'origin/master' into el6

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