]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Fri, 23 Sep 2011 17:28:03 +0000 (19:28 +0200)
committerTollef Fog Heen <tfheen@err.no>
Fri, 23 Sep 2011 17:28:03 +0000 (19:28 +0200)

Trivial merge