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)
Conflicts:
NEWS
configure.ac

1  2 
backends/telepathy/lib/tpf-persona.vala