Merge branch 'folks-0-6'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 30 Apr 2012 13:26:40 +0000 (15:26 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 30 Apr 2012 13:26:40 +0000 (15:26 +0200)
commit4cfb16eeb76e633aca2a5c33beb4e8b4d2f13a8f
tree5c6f9fe3e2ee20856e0bf98480a76e435db27f22
parent186a237ba31d9bb392a48511ab2b95bdb4352d2c
parent79f7983759a7d6b8527f31f3ecaa8f9b2e5e0525
Merge branch 'folks-0-6'

Conflicts:
NEWS
configure.ac
backends/telepathy/lib/tpf-persona.vala