]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commit
Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 15 Nov 2008 18:03:11 +0000 (19:03 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 15 Nov 2008 18:03:11 +0000 (19:03 +0100)
commit1cba03a1306423f7343b59b6b3268e4f00a27f5d
treeb8eb2029b3a22fece54f0c2e882b4d07cb2c2247
parent880689805c925099bfbbc4527f48af1d2febb1aa
parent45035bcaeea6c20351c005c1b7dceaa02b3bcfa2
Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

Conflicts:

tools/make-constants
lfs/Config
tools/make-constants