[bitlbee: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/bitlbee

[Matej Cepl]

commit 6e5091fea5caffec89491c74b4de520a4d150317
Merge: 1979579 04dafca
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Aug 16 15:22:58 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/bitlbee
    
    Conflicts:
    	bitlbee.spec

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