]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Wed, 28 Mar 2012 06:29:05 +0000 (17:29 +1100)
committerRobert Ancell <robert.ancell@canonical.com>
Wed, 28 Mar 2012 06:29:05 +0000 (17:29 +1100)

Trivial merge