]> 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: 599d475 39b83dc)
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 27 Jul 2011 16:46:30 +0000 (18:46 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 27 Jul 2011 16:46:30 +0000 (18:46 +0200)

Trivial merge
IPFire 2.x development tree