]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sun, 16 Jan 2011 10:00:53 +0000 (11:00 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sun, 16 Jan 2011 10:00:53 +0000 (11:00 +0100)

Trivial merge