]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Thu, 27 May 2010 20:59:40 +0000 (22:59 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 27 May 2010 20:59:40 +0000 (22:59 +0200)

Trivial merge