]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
projects / nfs-utils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: f8ae60e b0aae6b)
Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:42:00 +0000 (02:42 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:42:00 +0000 (02:42 +0100)
Conflicts:
aclocal.m4
config.guess
config.sub
configure
utils/Makefile.in


Trivial merge
Debian package of nfs-utils