]> git.ipfire.org Git - ipfire-3.x.git/commit
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 30 Apr 2009 07:51:10 +0000 (09:51 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 30 Apr 2009 07:51:10 +0000 (09:51 +0200)
commit9d0fbbcd05ebedb095c08d1c96342b1998c257aa
treef0b8bce63f6f483755871e5c5000deaeb2eb4ddb
parent95717923991a11e1d3b489bb68d8c0b20da52c8b
parent8adff61abe9040581326dd194141334eab102e74
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
lfs/lsof
lfs/strip
lfs/lsof
lfs/openldap
make.sh