]> 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: 8285512 791c2b4)
Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 4 Oct 2014 11:53:49 +0000 (13:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 4 Oct 2014 11:53:49 +0000 (13:53 +0200)

Trivial merge
Peter's tree of IPFire 2.x