]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Wed, 11 Dec 2013 03:29:45 +0000 (16:29 +1300)
committerRobert Ancell <robert.ancell@canonical.com>
Wed, 11 Dec 2013 03:29:45 +0000 (16:29 +1300)

Trivial merge