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

[Robert Scheck]

commit 4cf3190025f45b55ee123ac622e95ec176ca9f6d
Merge: 400d02a 85e36aa
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Nov 22 01:21:12 2011 +0100

    Merge remote branch 'origin/master' into el6

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