]> 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: 2a12798 bfaa695)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Jan 2014 21:35:11 +0000 (22:35 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Jan 2014 21:35:11 +0000 (22:35 +0100)

Trivial merge
IPFire 2.x development tree