]> err.no Git - systemd/commitdiff
Merge branch 'upstream-fixes' into debian
authorTollef Fog Heen <tfheen@err.no>
Mon, 2 Apr 2012 19:05:22 +0000 (21:05 +0200)
committerTollef Fog Heen <tfheen@err.no>
Mon, 2 Apr 2012 19:05:22 +0000 (21:05 +0200)

Trivial merge