]> 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: edc2be7 e247eb7)
Merge commit 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 Jan 2012 19:53:06 +0000 (20:53 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 Jan 2012 19:53:06 +0000 (20:53 +0100)

Trivial merge
IPFire 2.x development tree