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

Trivial merge