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

[Matej Cepl]

commit acb1431611cbffea12f37e5d620f235c85590257
Merge: ac6609f f17b9bf
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon May 12 01:37:22 2014 +0200

    Merge branch 'master' into el6

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