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

Trivial merge