From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Mon, 15 Aug 2011 10:55:44 +0000 (+0100)
Subject: Merge branch 'clutter-toolbar'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=6881301b5474f90a297b07aa63156d71171f2621

Merge branch 'clutter-toolbar'
---

6881301b5474f90a297b07aa63156d71171f2621