]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ae473e 2d940a9)
Merge branch 'naoki'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jan 2010 14:12:26 +0000 (15:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 29 Jan 2010 14:12:26 +0000 (15:12 +0100)
Conflicts:
make.sh


Trivial merge
Michael's tree of IPFire 3.x.