]> 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: fdf0c7c 9ab20bc)
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 5 Oct 2011 18:21:54 +0000 (20:21 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 5 Oct 2011 18:21:54 +0000 (20:21 +0200)

Trivial merge
IPFire 2.x development tree