]> git.decadent.org.uk Git - nfs-utils.git/commit
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)
commita444076202333c68108c21c0d89e251c092ff957
treefae44404a4ea7da8961a61753d2b827e4b075909
parente72df02d5318592cec199273b6c0b921b6712ac1
parentcd436ed94c09f70065648d5fc480dcbfbe3f6713
Merge branch 'upstream'

Conflicts:
aclocal.m4
config.guess
config.sub
configure
ltmain.sh