]> 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: be33adf 50ce309)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 16:13:34 +0000 (17:13 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 16:13:34 +0000 (17:13 +0100)

Trivial merge
IPFire 2.x development tree