]> err.no Git - systemd/commitdiff
Merge commit 'v20'
authorTollef Fog Heen <tfheen@err.no>
Fri, 11 Mar 2011 18:11:53 +0000 (19:11 +0100)
committerTollef Fog Heen <tfheen@err.no>
Fri, 11 Mar 2011 18:11:53 +0000 (19:11 +0100)

Trivial merge