]> 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: 0d573e2 668ea5d)
Merge branch 'nfs-server-fix' into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 3 Apr 2015 17:19:34 +0000 (19:19 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 3 Apr 2015 17:19:34 +0000 (19:19 +0200)

Trivial merge
Peter's tree of IPFire 2.x