]> 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: d8ce16f 03207e6)
Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 07:58:49 +0000 (09:58 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 07:58:49 +0000 (09:58 +0200)

Trivial merge
IPFire 2.x development tree