]> err.no Git - systemd/commitdiff
projects / systemd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 694af6b e6aad08)
Merge remote branch 'origin/master'
authorTollef Fog Heen <tfheen@err.no>
Mon, 17 May 2010 20:46:14 +0000 (22:46 +0200)
committerTollef Fog Heen <tfheen@err.no>
Mon, 17 May 2010 20:46:14 +0000 (22:46 +0200)
Conflicts:
configure.ac


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