]> 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: c98cc4a 0fbf414)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 17 Mar 2015 13:09:05 +0000 (14:09 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 17 Mar 2015 13:09:05 +0000 (14:09 +0100)

Trivial merge
Peter's tree of IPFire 2.x