]> 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: 72c10e8 d49c257)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 5 Jan 2012 13:59:25 +0000 (14:59 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 5 Jan 2012 13:59:25 +0000 (14:59 +0100)

Trivial merge
IPFire 2.x development tree