]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9332dfe 0027c4e)
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)
Conflicts:

src/initscripts/init.d/connectd


Trivial merge
Timo's tree of IPFire 2.x