[bitlbee/el6: 3/3] Merge branch 'master' into el6

[Matej Cepl]

commit 124bca3ad15d0cd0cd0e63e16b85b2e5cacf1d7a
Merge: 36198d1 04dafca
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Aug 16 14:28:45 2013 +0200

    Merge branch 'master' into el6

 bitlbee-3.2-libotr4.patch |  944 +++++++++++++++++++++++++++++++++++++++++++++
 bitlbee.spec              |   19 +-
 2 files changed, 959 insertions(+), 4 deletions(-)
---