From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 16 Mar 2015 08:43:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'micro/fix-build'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=29b956745586e58ce61cd66c1ebf48a625bb0ae7

Merge remote-tracking branch 'micro/fix-build'
---

29b956745586e58ce61cd66c1ebf48a625bb0ae7