]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Tue, 16 Jul 2013 23:29:17 +0000 (11:29 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Tue, 16 Jul 2013 23:29:17 +0000 (11:29 +1200)

Trivial merge