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

[Robert Scheck]

commit b9900cf69bdb190b0e79feb4a8ac32db99154f23
Merge: cbc26d3 9e0d600
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Dec 10 13:42:38 2011 +0100

    Merge remote branch 'origin/master' into f15

 .gitignore               |    1 +
 823_822.diff             |   31 -------------------------------
 bitlbee-syslibdirs.patch |    2 +-
 bitlbee.spec             |   11 ++++++-----
 sources                  |    2 +-
 5 files changed, 9 insertions(+), 38 deletions(-)
---