]> 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: b8fab20 de78a2b)
Merge branch 'core87' of git.ipfire.org:/pub/git/ipfire-2.x into core87
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Feb 2015 15:59:50 +0000 (16:59 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Feb 2015 15:59:50 +0000 (16:59 +0100)

Trivial merge
Peter's tree of IPFire 2.x