]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f55596e 7107b30)
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 13 Nov 2010 18:17:17 +0000 (19:17 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 13 Nov 2010 18:17:17 +0000 (19:17 +0100)

Trivial merge
IPFire 2.x development tree