[bitlbee/f15: 5/6] Merge remote branch 'origin/master' into f15

[Robert Scheck]

commit 4787f49eb54851c4a65a2eed7fe6219c946928fe
Merge: b9900cf d44470f
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun May 6 17:12:23 2012 +0200

    Merge remote branch 'origin/master' into f15

 .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(-)
---