]> 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: 9f44350 eb5b3f9)
Merge branch 'next' into uap
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 2 Nov 2011 15:46:45 +0000 (16:46 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 2 Nov 2011 15:46:45 +0000 (16:46 +0100)

Trivial merge
IPFire 2.x development tree