]> err.no Git - systemd/commit
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)
commit320cb19562d3d53869258935fadf933183c3d614
tree056599820399bef90227a1c911ae94b7e6ddacc5
parent694af6b2234b38e456cfba789cb8fea05a0f757d
parente6aad08ba82e44e88f9186eab30c68ceaf6370a3
Merge remote branch 'origin/master'

Conflicts:
configure.ac