]> 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: 670d514 a0ef4c5)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 8 Feb 2013 14:49:38 +0000 (15:49 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 8 Feb 2013 14:49:38 +0000 (15:49 +0100)

Trivial merge
IPFire 2.x development tree