]> 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: 1151f4d 7a524f8)
Merge branch 'core48'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 29 Mar 2011 14:20:45 +0000 (16:20 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 29 Mar 2011 14:20:45 +0000 (16:20 +0200)

Trivial merge
IPFire 2.x development tree