]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Fri, 26 Jul 2013 03:14:34 +0000 (15:14 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Fri, 26 Jul 2013 03:14:34 +0000 (15:14 +1200)

Trivial merge