]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 7 Jul 2010 20:02:36 +0000 (22:02 +0200)
committerTollef Fog Heen <tfheen@err.no>
Wed, 7 Jul 2010 20:02:36 +0000 (22:02 +0200)

Trivial merge