From: Travis Reitter <treitter@gmail.com>
Date: Tue, 27 Jul 2010 10:54:06 +0000 (+0200)
Subject: Merge branch 'folks-async-and-prepare'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=34e8fc1344c5433be1a9d8f8614cdb84933a84fb

Merge branch 'folks-async-and-prepare'
---

34e8fc1344c5433be1a9d8f8614cdb84933a84fb