Merge branch 'reference-identities'
authorStef Walter <stefw@collabora.co.uk>
Tue, 22 Mar 2011 14:22:43 +0000 (15:22 +0100)
committerStef Walter <stefw@collabora.co.uk>
Tue, 22 Mar 2011 14:22:43 +0000 (15:22 +0100)
commit6c5affb1f943b6685a0ac63adcfff24b47be6e2e
tree1e614836c265504c1c7c29911d5d1b8caac0f04c
parent5316d721a24d2c1c2496f751a4cf139d88e274c1
parent698675bdc1fbc7e6e622be24e272df7e70f34716
Merge branch 'reference-identities'

Conflicts:
libempathy/empathy-server-tls-handler.c