Merge branch 'master' into fixes3-no-prepare
authorPhilip Withnall <philip.withnall@collabora.co.uk>
Thu, 1 Jul 2010 17:12:11 +0000 (18:12 +0100)
committerPhilip Withnall <philip.withnall@collabora.co.uk>
Thu, 1 Jul 2010 17:12:11 +0000 (18:12 +0100)
commit606e8583760deae6d0ca259e1783c5253bd58994
treee4d3d0afaf31bd875bdb51e6a6eeece8154c7c2f
parent510d0291ebf3a789d0a602419435742c2a04e264
parent8c46af5fb52e887a5e193320aca67aa219e6cf11
Merge branch 'master' into fixes3-no-prepare

Conflicts:
backends/telepathy/tpf-persona.vala
folks/individual.vala
folks/persona.vala
backends/telepathy/tpf-persona-store.vala
backends/telepathy/tpf-persona.vala
folks/individual.vala