]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Mon, 27 Feb 2012 21:40:17 +0000 (22:40 +0100)
committerTollef Fog Heen <tfheen@err.no>
Mon, 27 Feb 2012 21:40:17 +0000 (22:40 +0100)

Trivial merge