From: Robert Ancell <robert.ancell@canonical.com>
Date: Tue, 16 Jul 2013 23:29:17 +0000 (+1200)
Subject: Merge with trunk
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/89db1d10d498eaf65d629c9d6cfceb34c1ec41b5

Merge with trunk
---

89db1d10d498eaf65d629c9d6cfceb34c1ec41b5