]> err.no Git - systemd/commitdiff
Merge commit 'v35'
authorTollef Fog Heen <tfheen@err.no>
Mon, 5 Sep 2011 06:06:45 +0000 (08:06 +0200)
committerTollef Fog Heen <tfheen@err.no>
Mon, 5 Sep 2011 06:06:45 +0000 (08:06 +0200)

Trivial merge