]> 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: 75474c3 9027a25)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Jan 2014 07:56:31 +0000 (08:56 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 6 Jan 2014 07:56:31 +0000 (08:56 +0100)

Trivial merge
IPFire 2.x development tree