]> 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: 02d67e7 89baf6d)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Jul 2013 18:08:40 +0000 (20:08 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Jul 2013 18:08:40 +0000 (20:08 +0200)

Trivial merge
Peter's tree of IPFire 2.x