From: Robert Ancell <robert.ancell@canonical.com>
Date: Wed, 24 Jul 2013 05:58:34 +0000 (+1200)
Subject: Merge with trunk
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/41a3a811bc309bf735a1c02b9c18b60fcfb9f40e

Merge with trunk
---

41a3a811bc309bf735a1c02b9c18b60fcfb9f40e