]> 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: 69a324f c24eba2)
Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Jun 2014 16:22:35 +0000 (18:22 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Jun 2014 16:22:35 +0000 (18:22 +0200)

Trivial merge
Peter's tree of IPFire 2.x