projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49eb9fd 3a3940b)
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Nov 2010 23:14:47 +0000 (00:14 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Nov 2010 23:14:47 +0000 (00:14 +0100)
Conflicts:
make.sh


Trivial merge
Peter's tree of IPFire 2.x