[bitlbee/el5: 3/3] Merge remote branch 'origin/master' into el5

Sun Jul 6 16:23:06 UTC 2014

commit 1f510a74588ea6317d2033dc9187e8f2eab9cb61
Merge: 1587384 ad289e8
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 6 18:23:10 2014 +0200

    Merge remote branch 'origin/master' into el5

 bitlbee-3.2-install.patch      |   75 ----
 bitlbee-3.2-libotr4.patch      |  937 ----------------------------------------
 bitlbee-3.2.2-libotr-3-4.patch |  715 ++++++++++++++++++++++++++++++
 bitlbee-3.2.2-no-root.patch    |   21 +
 bitlbee-IPv6.patch             |   12 -
 bitlbee-systemd.patch          |    2 +-
 bitlbee-xinetd.patch           |   32 --
 bitlbee.spec                   |   62 ++-
 sources                        |    2 +-
 9 files changed, 778 insertions(+), 1080 deletions(-)
---