]> err.no Git - systemd/commitdiff
Merge commit 'v25'
authorTollef Fog Heen <tfheen@err.no>
Thu, 21 Apr 2011 10:53:30 +0000 (12:53 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 21 Apr 2011 10:53:30 +0000 (12:53 +0200)

Trivial merge