From: Robert Ancell <robert.ancell@canonical.com>
Date: Tue, 11 Mar 2014 03:18:51 +0000 (+1300)
Subject: Merge with trunk
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/b09af8883a43a4532f6debd2d6d6e1b754aaac95

Merge with trunk
---

b09af8883a43a4532f6debd2d6d6e1b754aaac95