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

[Robert Scheck]

commit 2afba54a79ea6320ad9e332fe5524e2e85b40c25
Merge: b61016a 85e36aa
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Nov 22 01:25:07 2011 +0100

    Merge remote branch 'origin/master' into el5

 823_822.diff          |   31 +++++++++++++++++++++++++++++++
 bitlbee-systemd.patch |    5 +++--
 bitlbee.spec          |   31 ++++++++++++++++++++++---------
 3 files changed, 56 insertions(+), 11 deletions(-)
---