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

[Robert Scheck]

commit 04bcdc883110054b5c54ff0fa3a695e3bf7fd545
Merge: ddc1d1e d44470f
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun May 6 17:13:15 2012 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore                                         |    7 +---
 ...ent.patch => bitlbee-3.0.5-des3-implement.patch |    6 +-
 bitlbee-3.0.5-installP.patch                       |   35 +++++++++++++++++
 bitlbee-installP.patch                             |   41 --------------------
 bitlbee.spec                                       |   24 +++++++----
 sources                                            |    2 +-
 6 files changed, 55 insertions(+), 60 deletions(-)
---