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

[Robert Scheck]

commit cb1c8e2cdda9d965681cbe87dbb6ab4c37f4310b
Merge: 2afba54 9e0d600
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Dec 10 13:43:31 2011 +0100

    Merge remote branch 'origin/master' into el5

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