[bitlbee/f15: 3/3] Merge commit '0639f7ffe348b90b4e72f0599b922c683c0fb93b' into f15

[Adam Williamson]

commit b87834ef79f504085208223041a87e981d4a9b55
Merge: b9900cf 0639f7f
Author: Adam Williamson <awilliam at redhat.com>
Date:   Sun Jan 15 11:24:22 2012 -0500

    Merge commit '0639f7ffe348b90b4e72f0599b922c683c0fb93b' into f15

 871_870.diff |   22 ++++++++++++++++++++++
 bitlbee.spec |   12 +++++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---