]> err.no Git - systemd/commitdiff
Merge branch 'upstream-fixes' into debian
authorTollef Fog Heen <tfheen@err.no>
Sun, 1 Jul 2012 06:35:10 +0000 (08:35 +0200)
committerTollef Fog Heen <tfheen@err.no>
Sun, 1 Jul 2012 06:35:10 +0000 (08:35 +0200)

Trivial merge