[bitlbee/el6: 11/11] Merge branch 'master' into el6

[Matej Cepl]

commit 400d02af7fa23a06bb19367c18d06c57f7ea7374
Merge: cb4544b d76f62d
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Jul 26 10:42:18 2011 +0200

    Merge branch 'master' into el6

 .gitignore                   |    2 +
 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        |  178 ++++--------------------------------------
 bitlbee.spec                 |   96 +++++++++++++++++------
 sources                      |    2 +-
 10 files changed, 130 insertions(+), 250 deletions(-)
---