]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: fc99217 b88cd7c)
Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 17 Dec 2012 15:11:53 +0000 (16:11 +0100)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Mon, 17 Dec 2012 15:11:53 +0000 (16:11 +0100)

Trivial merge
IPFire 2.x development tree