]> 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: bc8fe5f 7405b74)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 12 Oct 2011 16:58:09 +0000 (16:58 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 12 Oct 2011 16:58:09 +0000 (16:58 +0000)

Trivial merge
IPFire 2.x development tree