]> 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: 7c0fce5 32e754c)
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Sep 2011 14:43:42 +0000 (16:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Sep 2011 14:43:42 +0000 (16:43 +0200)

Trivial merge
IPFire 2.x development tree