]> err.no Git - systemd/commitdiff
Merge commit 'v36'
authorTollef Fog Heen <tfheen@err.no>
Fri, 23 Sep 2011 17:27:55 +0000 (19:27 +0200)
committerTollef Fog Heen <tfheen@err.no>
Fri, 23 Sep 2011 17:27:55 +0000 (19:27 +0200)

Trivial merge