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

[Robert Scheck]

commit f9d9b2da5df6f607556c99977bda93a052705126
Merge: 3b20a55 f17b9bf
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon May 12 21:49:07 2014 +0200

    Merge remote branch 'origin/master' into el5

 bitlbee-xinetd.patch |   29 +++++++++++++++++++++++++++++
 bitlbee.spec         |   28 +++++++++++++++++++++-------
 bitlbee.xinetd       |   15 ---------------
 3 files changed, 50 insertions(+), 22 deletions(-)
---