]> err.no Git - systemd/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sat, 15 Jan 2011 06:24:41 +0000 (07:24 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sat, 15 Jan 2011 06:24:41 +0000 (07:24 +0100)
commitf1eab28ed210e350433b0d695c16895e3d17ca2e
treef7a0dcdaf6d0e19349a3ef989814fd88386a7367
parent4ad09fb0bc755dbed06065b5d8e5725e5330bb73
parent0acc99ff21bb48f5fd54163bf716250df979c8a7
Merge branch 'master' into debian

Conflicts:
configure.ac
src/gnome-ask-password-agent.vala
units/serial-getty@.service.m4