]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge in changes
authorRobert Ancell <robert.ancell@canonical.com>
Fri, 7 Oct 2011 22:45:53 +0000 (09:45 +1100)
committerRobert Ancell <robert.ancell@canonical.com>
Fri, 7 Oct 2011 22:45:53 +0000 (09:45 +1100)

Trivial merge