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

Trivial merge