]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7929cf 9c55c65)
Merge branch 'master' into core71 v2.13-core71
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 16 Jul 2013 21:06:56 +0000 (23:06 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 16 Jul 2013 21:06:56 +0000 (23:06 +0200)

Trivial merge
Peter's tree of IPFire 2.x