]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
projects / nfs-utils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba46347 52d922e)
Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:48:21 +0000 (02:48 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:48:21 +0000 (02:48 +0100)
Conflicts:
configure
utils/mountd/fsloc.c


Trivial merge
Debian package of nfs-utils