[bitlbee/el5: 7/7] Merge branch 'master' into el5

[Matej Cepl]

commit 85273b296d639ac6a38ecf6d3a58059cb70d52e4
Merge: bc6665e b52b9a1
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Aug 16 15:49:48 2013 +0200

    Merge branch 'master' into el5

 bitlbee-3.2-libotr4.patch |  944 +++++++++++++++++++++++++++++++++++++++++++++
 bitlbee-IPv6.patch        |   12 +
 bitlbee.spec              |   31 ++-
 3 files changed, 985 insertions(+), 2 deletions(-)
---