From: Robert Ancell <robert.ancell@canonical.com>
Date: Fri, 28 Jun 2013 08:22:31 +0000 (+1200)
Subject: Merge with trunk
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/c66e020b7c8d233048a4e020b597e121ce26419a

Merge with trunk
---

c66e020b7c8d233048a4e020b597e121ce26419a