]> 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: cfeeb42 bc7fffe)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 16:15:27 +0000 (18:15 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 16:15:27 +0000 (18:15 +0200)

Trivial merge
IPFire 2.x development tree