[bitlbee/f12/master: 2/2] Merge branch 'master' into f12

[Matej Cepl]

commit 673a47fc91ff6776bdc0aeb066f642c0559e4950
Merge: 68d1241 f55b693
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Nov 22 20:18:18 2010 +0100

    Merge branch 'master' into f12

 bitlbee.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---