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