[bitlbee/el4: 18/18] Merge remote branch 'origin/master' into el4

[Robert Scheck]

commit 253cc4b48ca4cf1b4318598c72e0b9fe6c94a452
Merge: 26e262d 85e36aa
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Nov 22 09:21:09 2011 +0100

    Merge remote branch 'origin/master' into el4

 .gitignore                   |    2 +
 823_822.diff                 |   31 +++++++
 bitlbee-des3-implement.patch |   16 ++--
 bitlbee-forkdaemon.patch     |    7 +-
 bitlbee-installP.patch       |   33 +++-----
 bitlbee-libresolv.patch      |   18 +++--
 bitlbee-ssl_pending.patch    |   19 -----
 bitlbee-syslibdirs.patch     |    9 +-
 bitlbee-systemd.patch        |  179 ++++--------------------------------------
 bitlbee.spec                 |  121 +++++++++++++++++++++-------
 sources                      |    2 +-
 11 files changed, 181 insertions(+), 256 deletions(-)
---