]> err.no Git - systemd/commitdiff
projects / systemd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3492207 3e1f2b4)
Merge branch 'master' into upstream-fixes
authorTollef Fog Heen <tfheen@err.no>
Fri, 29 Jun 2012 20:38:09 +0000 (22:38 +0200)
committerTollef Fog Heen <tfheen@err.no>
Fri, 29 Jun 2012 20:38:09 +0000 (22:38 +0200)

Trivial merge
systemd, git://git.err.no/systemd