]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Mon, 2 Apr 2012 18:16:01 +0000 (20:16 +0200)
committerTollef Fog Heen <tfheen@err.no>
Mon, 2 Apr 2012 18:16:01 +0000 (20:16 +0200)

Trivial merge