]> git.ipfire.org Git - ipfire-2.x.git/commit
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorManiacikarus <maniacikarus@ipfire.org>
Tue, 26 Aug 2008 19:10:08 +0000 (21:10 +0200)
committerManiacikarus <maniacikarus@ipfire.org>
Tue, 26 Aug 2008 19:10:08 +0000 (21:10 +0200)
commit289ad04e708428d08271014de1092103db06c13c
treea5a4615e5b8884f48ec41cb46575e3e23ee1cb05
parent9332dfe1c2763df18ef0d08f771e4565c0bc44dc
parent0027c4e0291a3f8939d98816f612d5ba4ef73d87
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Conflicts:

src/initscripts/init.d/connectd