]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
projects / sojka / lightdm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b32e2f0 f8e38e4)
lp:lightdm is ahead of the archive, and lp:ubuntu/lightdm didn't match what's in...
authorDimitri John Ledkov <dimitri.ledkov@canonical.com>
Tue, 4 Feb 2014 10:46:05 +0000 (10:46 +0000)
committerTarmac <Unknown>
Tue, 4 Feb 2014 10:46:05 +0000 (10:46 +0000)
Here is the sync of the changes, this time around it's a shutdown lightdm portion of bug #967229. Fixes: https://bugs.launchpad.net/bugs/967229.

Approved by PS Jenkins bot, Robert Ancell.


Trivial merge