]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
projects / nfs-utils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e72df02 cd436ed)
Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 02:00:16 +0000 (03:00 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 02:00:16 +0000 (03:00 +0100)
Conflicts:
aclocal.m4
config.guess
config.sub
configure
ltmain.sh


Trivial merge
Debian package of nfs-utils