]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Wed, 28 Nov 2012 03:59:59 +0000 (16:59 +1300)
committerRobert Ancell <robert.ancell@canonical.com>
Wed, 28 Nov 2012 03:59:59 +0000 (16:59 +1300)

Trivial merge