]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
projects / nfs-utils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ce9aca 8dcd890)
Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:47:18 +0000 (02:47 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:47:18 +0000 (02:47 +0100)
Conflicts:
configure
utils/mountd/Makefile.in


Trivial merge
Debian package of nfs-utils