commit 96001bda37fa4f0d7bdf7853eb281de3089174f7 Merge: 124bca3 b52b9a1 Author: Matěj Cepl <mcepl at redhat.com> Date: Fri Aug 16 15:32:31 2013 +0200 Merge branch 'master' into el6 bitlbee-IPv6.patch | 12 ++++++++++++ bitlbee.spec | 18 +++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletions(-) ---