]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f7d9a9 1f8ea39)
Merge remote-tracking branch 'mfischer/wget' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:51:49 +0000 (23:51 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:51:49 +0000 (23:51 +0100)
Conflicts:
make.sh


Trivial merge
Peter's tree of IPFire 2.x